Merge pull request #2004 from porter-dev/master

Overwrite fix for ACR -> staging

.github/workflows/prerelease.yaml

@@ -251,8 +251,8 @@ jobs:
     name: Zip binaries, create release and upload assets
     runs-on: ubuntu-latest
     needs:
-    - notarize
-    - build-linux
+      - notarize
+      - build-linux
     steps:
       - name: Get tag name
         id: tag_name
@@ -517,3 +517,7 @@ jobs:
         run: gh workflow run porter_test_docker_production.yml --repo porter-dev/new-release-tests
         env:
           GITHUB_TOKEN: ${{ secrets.PORTER_DEV_GITHUB_TOKEN }}
+      - name: Run test_porter_cli.yml workflow
+        run: gh workflow run test_porter_cli.yml --repo porter-dev/new-release-tests
+        env:
+          GITHUB_TOKEN: ${{ secrets.PORTER_DEV_GITHUB_TOKEN }}

internal/repository/gorm/auth.go

@@ -1419,13 +1419,8 @@ func (repo *AzureIntegrationRepository) OverwriteAzureIntegration(
 		}
 	}
 
-	err = repo.DecryptAzureIntegrationData(az, repo.key)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return az, nil
+	// perform another read
+	return repo.ReadAzureIntegration(az.ProjectID, az.ID)
 }
 
 // ReadAzureIntegration finds a Azure auth mechanism by id