remove default references to user and password due to string interpol…

…ation failing when values empty
red-gate · Jun 14, 2024 · d05307f · d05307f
1 parent 34848a3
commit d05307f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/Azure/Azure-Templatized-YML-Pipeline/flyway-10.4/templates/build.yml b/Azure/Azure-Templatized-YML-Pipeline/flyway-10.4/templates/build.yml
@@ -35,7 +35,7 @@ stages:
           env:
             FLYWAY_CLEAN_DISABLED: false
 
-        - script: '$(FLYWAY) info check -environment="target" -environments.target.url="$(target_database_JDBC)" -environments.check.url="$(check_JDBC)" -environments.check.user="$(check_userName)" -environments.check.password="$(check_password)" -check.buildEnvironment="check" -check.rulesLocation="$(Build.SourcesDirectory)\templates\rules" -code -reportFilename="$(System.ArtifactsDirectory)\$(databaseName)-$(Build.BuildId)-Code-Analysis.html"  -locations="filesystem:$(WORKING_DIRECTORY)\$(Build.Repository.Name)\migrations"'
+        - script: '$(FLYWAY) info check -environment="target" -environments.target.url="$(target_database_JDBC)" -environments.check.url="$(check_JDBC)" -check.buildEnvironment="check" -check.rulesLocation="$(Build.SourcesDirectory)\templates\rules" -code -reportFilename="$(System.ArtifactsDirectory)\$(databaseName)-$(Build.BuildId)-Code-Analysis.html"  -locations="filesystem:$(WORKING_DIRECTORY)\$(Build.Repository.Name)\migrations"'
           continueOnError: false
           workingDirectory: '$(WORKING_DIRECTORY)\$(Build.Repository.Name)'
           displayName: '$(DRIFT_AND_CHANGE_REPORT_DISPLAY_NAME)'
@@ -56,4 +56,4 @@ stages:
 
         - script: '$(FLYWAY) undo info -url="$(target_database_JDBC)" -locations="filesystem:$(WORKING_DIRECTORY)\$(Build.Repository.Name)\migrations" -target="$(FIRST_UNDO_SCRIPT)"?'
           continueOnError: true
-          displayName: 'Validate Undo Scripts'
+          displayName: 'Validate Undo Scripts'
diff --git a/Azure/Azure-Templatized-YML-Pipeline/flyway-10.4/templates/deploy.yml b/Azure/Azure-Templatized-YML-Pipeline/flyway-10.4/templates/deploy.yml
@@ -45,7 +45,7 @@ stages:
           - checkout: self
             name: source
 
-          - script: '$(FLYWAY) info check -code -environment="target" -environments.target.url="$(target_database_JDBC)" -environments.target.user="$(user)" -environments.target.password="$(password)" -check.rulesLocation="$(Build.SourcesDirectory)\templates\rules" -reportFilename="$(System.ArtifactsDirectory)\$(databaseName)-$(Build.BuildId)-$(DRIFT_AND_CHANGE_REPORT)"  -locations="filesystem:$(WORKING_DIRECTORY)\$(Build.Repository.Name)\migrations"'
+          - script: '$(FLYWAY) info check -code -environment="target" -environments.target.url="$(target_database_JDBC)" -check.rulesLocation="$(Build.SourcesDirectory)\templates\rules" -reportFilename="$(System.ArtifactsDirectory)\$(databaseName)-$(Build.BuildId)-$(DRIFT_AND_CHANGE_REPORT)"  -locations="filesystem:$(WORKING_DIRECTORY)\$(Build.Repository.Name)\migrations"'
             continueOnError: false
             workingDirectory: '$(WORKING_DIRECTORY)\$(Build.Repository.Name)'
             displayName: '$(DRIFT_AND_CHANGE_REPORT_DISPLAY_NAME)'
@@ -72,7 +72,7 @@ stages:
           - checkout: self
             name: source
 
-          - script: '$(FLYWAY) info check -dryrun -drift -changes -code -environment="target" -environments.target.url="$(target_database_JDBC)" -environments.target.user="$(user)" -environments.target.password="$(password)" -environments.check.url="$(check_JDBC)" -environments.check.user="$(check_userName)" -environments.check.password="$(check_password)" -check.buildEnvironment="check" -check.rulesLocation="$(Build.SourcesDirectory)\templates\rules" -check.failOnDrift="${{parameters.failReleaseIfDriftDetected}}" -reportFilename="$(System.ArtifactsDirectory)\$(databaseName)-$(Build.BuildId)-$(DRIFT_AND_CHANGE_REPORT)"  -locations="filesystem:$(WORKING_DIRECTORY)\$(Build.Repository.Name)\migrations"'
+          - script: '$(FLYWAY) info check -dryrun -drift -changes -code -environment="target" -environments.target.url="$(target_database_JDBC)" -environments.check.url="$(check_JDBC)" -check.buildEnvironment="check" -check.rulesLocation="$(Build.SourcesDirectory)\templates\rules" -check.failOnDrift="${{parameters.failReleaseIfDriftDetected}}" -reportFilename="$(System.ArtifactsDirectory)\$(databaseName)-$(Build.BuildId)-$(DRIFT_AND_CHANGE_REPORT)"  -locations="filesystem:$(WORKING_DIRECTORY)\$(Build.Repository.Name)\migrations"'
             continueOnError: false
             workingDirectory: '$(WORKING_DIRECTORY)\$(Build.Repository.Name)'
             displayName: '$(DRIFT_AND_CHANGE_REPORT_DISPLAY_NAME)'
@@ -95,7 +95,7 @@ stages:
         - group: redgate_global_vars
         steps:
 
-          - script: '$(FLYWAY) info check -dryrun -drift -changes -environment="target" -environments.target.url="$(target_database_JDBC)" -environments.check.url="$(check_JDBC)" -environments.check.user="$(check_userName)" -environments.check.password="$(check_password)" -check.buildEnvironment="check" -check.rulesLocation="$(Build.SourcesDirectory)\templates\rules" -check.failOnDrift="${{parameters.failReleaseIfDriftDetected}}" -reportFilename="$(System.ArtifactsDirectory)\$(databaseName)-$(Build.BuildId)-$(DRIFT_AND_CHANGE_REPORT)"  -locations="filesystem:$(WORKING_DIRECTORY)\$(Build.Repository.Name)\migrations"'
+          - script: '$(FLYWAY) info check -dryrun -drift -changes -environment="target" -environments.target.url="$(target_database_JDBC)" -environments.check.url="$(check_JDBC)" -check.buildEnvironment="check" -check.rulesLocation="$(Build.SourcesDirectory)\templates\rules" -check.failOnDrift="${{parameters.failReleaseIfDriftDetected}}" -reportFilename="$(System.ArtifactsDirectory)\$(databaseName)-$(Build.BuildId)-$(DRIFT_AND_CHANGE_REPORT)"  -locations="filesystem:$(WORKING_DIRECTORY)\$(Build.Repository.Name)\migrations"'
             workingDirectory: '$(WORKING_DIRECTORY)'
             continueOnError: false
             displayName: '$(DRIFT_AND_CHANGE_REPORT_DISPLAY_NAME)'

diff --git a/Azure/Azure-Templatized-YML-Pipeline/flyway-10.4/templates/vars.yml b/Azure/Azure-Templatized-YML-Pipeline/flyway-10.4/templates/vars.yml
@@ -16,7 +16,12 @@ variables:
 
   # Self-hosted install of Flyway version
   # -check.majorRules="RX901,RX902,RX903,RX904"
-  FLYWAY: 'flyway -user="$(userName)" -check.majorRules="RX100,RX101" -check.majorTolerance="0" -password="$(password)" -installedBy="$(Build.BuildId)" "-plugins.clean.mode=default" -schemas="$(schemas)" -baselineOnMigrate=true -errorOverrides=S0001:0:I- -baselineVersion=$(BASELINE_VERSION) -licenseKey=$(FLYWAY_LICENSE_KEY) -workingDirectory="$(WORKING_DIRECTORY)" -oracle.sqlplus="true"'
+
+  # these can be added as needed depending on auth type - add to deploy template as well
+  # -environments.target.user="$(user)" -environments.target.password="$(password)"
+  # -environments.check.user="$(check_userName)" -environments.check.password="$(check_password)"
+
+  FLYWAY: 'flyway -check.majorRules="RX100,RX101" -check.majorTolerance="0" -installedBy="$(Build.BuildId)" "-plugins.clean.mode=default" -schemas="$(schemas)" -baselineOnMigrate=true -errorOverrides=S0001:0:I- -baselineVersion=$(BASELINE_VERSION) -licenseKey=$(FLYWAY_LICENSE_KEY) -workingDirectory="$(WORKING_DIRECTORY)" -oracle.sqlplus="true"'
 
   BUILD_NAME: 'Repository-Snapshot'
   RELEASE_PREVIEW: 'Release-Preview.sql'