From 1019428fc88906f11c57851be08150c691d7b7d9 Mon Sep 17 00:00:00 2001 From: Markus Date: Wed, 22 Nov 2023 14:51:05 +0000 Subject: [PATCH 1/7] Changed to SFA-DIG-PreProd-ARM --- pipeline-templates/job/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pipeline-templates/job/deploy.yml b/pipeline-templates/job/deploy.yml index cd99207b5..ad19dba0c 100644 --- a/pipeline-templates/job/deploy.yml +++ b/pipeline-templates/job/deploy.yml @@ -1,7 +1,7 @@ parameters: Environment: ServiceConnection: - LegacyApimServiceConnection: NAS Pre-Prod (ARM) + LegacyApimServiceConnection: SFA-DIG-PreProd-ARM OverrideBlockOnPossibleDataLoss: false jobs: @@ -177,7 +177,7 @@ jobs: - task: AzurePowerShell@5 displayName: 'Import Swagger Definition' inputs: - azureSubscription: 'NAS Pre-Prod (ARM)' + azureSubscription: 'SFA-DIG-PreProd-ARM' ScriptPath: $(Pipeline.Workspace)/SFA.DAS.AssessorService/azure/scripts/Import-APIMSwaggerApiDefinition.ps1 ScriptArguments: '-ResourceGroupName "$(ApimResourceGroup)" -ServiceName "$(ApimServiceName)" -ApiId "$(externalApiSandboxApiId)" -SwaggerSpecificationUrl "$(externalApiSandboxSwaggerUrl)" -ApiUrlSuffix "$(externalApiSandboxUrlSuffix)" -ServiceUrl "https://$(externalApiSandboxCustomHostname)"' azurePowerShellVersion: LatestVersion @@ -185,7 +185,7 @@ jobs: - task: AzurePowerShell@5 displayName: 'Set API Level Policy' inputs: - azureSubscription: 'NAS Pre-Prod (ARM)' + azureSubscription: 'SFA-DIG-PreProd-ARM' ScriptPath: $(Pipeline.Workspace)/SFA.DAS.AssessorService/azure/scripts/Set-ApimApiPolicy.ps1 ScriptArguments: '-ResourceGroupName "$(ApimResourceGroup)" -ServiceName "$(ApimServiceName)" -ApiId "$(externalApiSandboxApiId)" -ApimApiPolicyFilePath "$(ApimApiPolicyFilePath)"' azurePowerShellVersion: LatestVersion From dd3af569b13461bd4ab5b26dd6416d1517d59047 Mon Sep 17 00:00:00 2001 From: Markus Date: Wed, 22 Nov 2023 14:53:19 +0000 Subject: [PATCH 2/7] Moved SFA-DIG-PreProd-ARM in azure-pipelines.yaml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1dae7c5b1..af7b808d4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -67,7 +67,7 @@ stages: parameters: Environment: AT ServiceConnection: SFA-DAS-DevTest-ARM - LegacyApimServiceConnection: NAS-DevTest-ARM + LegacyApimServiceConnection: SFA-DIG-PreProd-ARM OverrideBlockOnPossibleDataLoss: ${{ parameters.OverrideBlockOnPossibleDataLoss }} - stage: Deploy_TEST From 80cebf602f94cf8739e07300aa5fbfdf0f81c848 Mon Sep 17 00:00:00 2001 From: Divesh Mavji <30622893+divesh987@users.noreply.github.com> Date: Wed, 29 Nov 2023 13:16:32 +0000 Subject: [PATCH 3/7] Updated LegacyAPIM service connection Updated LegacyAPIM service connection from Pre-Prod to paramater --- pipeline-templates/job/deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pipeline-templates/job/deploy.yml b/pipeline-templates/job/deploy.yml index ad19dba0c..f529a152e 100644 --- a/pipeline-templates/job/deploy.yml +++ b/pipeline-templates/job/deploy.yml @@ -1,7 +1,7 @@ parameters: Environment: ServiceConnection: - LegacyApimServiceConnection: SFA-DIG-PreProd-ARM + LegacyApimServiceConnection: ${{ parameters.ServiceConnection }} OverrideBlockOnPossibleDataLoss: false jobs: @@ -114,7 +114,7 @@ jobs: - task: AzurePowerShell@5 displayName: 'Import Swagger Definition' inputs: - azureSubscription: ${{ parameters.LegacyApimServiceConnection }} + azureSubscription: ${{ parameters.ServiceConnection }} ScriptPath: $(Pipeline.Workspace)/SFA.DAS.AssessorService/azure/scripts/Import-APIMSwaggerApiDefinition.ps1 ScriptArguments: '-ResourceGroupName "$(ApimResourceGroup)" -ServiceName "$(ApimServiceName)" -ApiId "$(externalApiApiId)" -SwaggerSpecificationUrl "$(externalApiSwaggerUrl)" -ApiUrlSuffix "$(externalApiUrlSuffix)" -ServiceUrl "https://$(externalApiCustomHostname)"' azurePowerShellVersion: LatestVersion @@ -122,7 +122,7 @@ jobs: - task: AzurePowerShell@5 displayName: 'Set API Level Policy' inputs: - azureSubscription: ${{ parameters.LegacyApimServiceConnection }} + azureSubscription: ${{ parameters.ServiceConnection }} ScriptPath: $(Pipeline.Workspace)/SFA.DAS.AssessorService/azure/scripts/Set-ApimApiPolicy.ps1 ScriptArguments: '-ResourceGroupName "$(ApimResourceGroup)" -ServiceName "$(ApimServiceName)" -ApiId "$(externalApiApiId)" -ApimApiPolicyFilePath "$(ApimApiPolicyFilePath)"' azurePowerShellVersion: LatestVersion @@ -189,4 +189,4 @@ jobs: ScriptPath: $(Pipeline.Workspace)/SFA.DAS.AssessorService/azure/scripts/Set-ApimApiPolicy.ps1 ScriptArguments: '-ResourceGroupName "$(ApimResourceGroup)" -ServiceName "$(ApimServiceName)" -ApiId "$(externalApiSandboxApiId)" -ApimApiPolicyFilePath "$(ApimApiPolicyFilePath)"' azurePowerShellVersion: LatestVersion - pwsh: true \ No newline at end of file + pwsh: true From a1c010fa8abfc985c25193d456df891a0fcc8b3a Mon Sep 17 00:00:00 2001 From: Divesh Mavji <30622893+divesh987@users.noreply.github.com> Date: Wed, 29 Nov 2023 13:18:36 +0000 Subject: [PATCH 4/7] Update azureSubscription Parameterise azure subscription --- pipeline-templates/job/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pipeline-templates/job/deploy.yml b/pipeline-templates/job/deploy.yml index f529a152e..ffd389769 100644 --- a/pipeline-templates/job/deploy.yml +++ b/pipeline-templates/job/deploy.yml @@ -177,7 +177,7 @@ jobs: - task: AzurePowerShell@5 displayName: 'Import Swagger Definition' inputs: - azureSubscription: 'SFA-DIG-PreProd-ARM' + azureSubscription: ${{ parameters.ServiceConnection }} ScriptPath: $(Pipeline.Workspace)/SFA.DAS.AssessorService/azure/scripts/Import-APIMSwaggerApiDefinition.ps1 ScriptArguments: '-ResourceGroupName "$(ApimResourceGroup)" -ServiceName "$(ApimServiceName)" -ApiId "$(externalApiSandboxApiId)" -SwaggerSpecificationUrl "$(externalApiSandboxSwaggerUrl)" -ApiUrlSuffix "$(externalApiSandboxUrlSuffix)" -ServiceUrl "https://$(externalApiSandboxCustomHostname)"' azurePowerShellVersion: LatestVersion @@ -185,7 +185,7 @@ jobs: - task: AzurePowerShell@5 displayName: 'Set API Level Policy' inputs: - azureSubscription: 'SFA-DIG-PreProd-ARM' + azureSubscription: ${{ parameters.ServiceConnection }} ScriptPath: $(Pipeline.Workspace)/SFA.DAS.AssessorService/azure/scripts/Set-ApimApiPolicy.ps1 ScriptArguments: '-ResourceGroupName "$(ApimResourceGroup)" -ServiceName "$(ApimServiceName)" -ApiId "$(externalApiSandboxApiId)" -ApimApiPolicyFilePath "$(ApimApiPolicyFilePath)"' azurePowerShellVersion: LatestVersion From ad90d6d80a6c798e055583d6b1f91e6969aa2524 Mon Sep 17 00:00:00 2001 From: Divesh Mavji <30622893+divesh987@users.noreply.github.com> Date: Wed, 29 Nov 2023 13:23:04 +0000 Subject: [PATCH 5/7] Removed unneccessary param --- pipeline-templates/job/deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/pipeline-templates/job/deploy.yml b/pipeline-templates/job/deploy.yml index ffd389769..7a7daa418 100644 --- a/pipeline-templates/job/deploy.yml +++ b/pipeline-templates/job/deploy.yml @@ -1,7 +1,6 @@ parameters: Environment: ServiceConnection: - LegacyApimServiceConnection: ${{ parameters.ServiceConnection }} OverrideBlockOnPossibleDataLoss: false jobs: From 8571708526403b3a00fea4d6525300f287864469 Mon Sep 17 00:00:00 2001 From: Rohon Debray <95615458+debrr07@users.noreply.github.com> Date: Wed, 29 Nov 2023 22:55:48 +0000 Subject: [PATCH 6/7] Updated TEST stage to deploy to PP in FCS --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index af7b808d4..b45997d08 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -67,7 +67,7 @@ stages: parameters: Environment: AT ServiceConnection: SFA-DAS-DevTest-ARM - LegacyApimServiceConnection: SFA-DIG-PreProd-ARM + LegacyApimServiceConnection: NAS-DevTest-ARM OverrideBlockOnPossibleDataLoss: ${{ parameters.OverrideBlockOnPossibleDataLoss }} - stage: Deploy_TEST @@ -83,6 +83,7 @@ stages: parameters: Environment: TEST ServiceConnection: SFA-DAS-DevTest-ARM + LegacyApimServiceConnection: SFA-DIG-PreProd-ARM OverrideBlockOnPossibleDataLoss: ${{ parameters.OverrideBlockOnPossibleDataLoss }} - stage: Deploy_TEST2 From 1c37f2a7ae1024470382852d6e26247ba257fa81 Mon Sep 17 00:00:00 2001 From: Rohon Debray <95615458+debrr07@users.noreply.github.com> Date: Wed, 29 Nov 2023 22:58:09 +0000 Subject: [PATCH 7/7] Reverted to previous changes --- pipeline-templates/job/deploy.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pipeline-templates/job/deploy.yml b/pipeline-templates/job/deploy.yml index 7a7daa418..f26fef438 100644 --- a/pipeline-templates/job/deploy.yml +++ b/pipeline-templates/job/deploy.yml @@ -1,6 +1,7 @@ parameters: Environment: ServiceConnection: + LegacyApimServiceConnection: NAS Pre-Prod (ARM) OverrideBlockOnPossibleDataLoss: false jobs: @@ -113,7 +114,7 @@ jobs: - task: AzurePowerShell@5 displayName: 'Import Swagger Definition' inputs: - azureSubscription: ${{ parameters.ServiceConnection }} + azureSubscription: ${{ parameters.LegacyApimServiceConnection }} ScriptPath: $(Pipeline.Workspace)/SFA.DAS.AssessorService/azure/scripts/Import-APIMSwaggerApiDefinition.ps1 ScriptArguments: '-ResourceGroupName "$(ApimResourceGroup)" -ServiceName "$(ApimServiceName)" -ApiId "$(externalApiApiId)" -SwaggerSpecificationUrl "$(externalApiSwaggerUrl)" -ApiUrlSuffix "$(externalApiUrlSuffix)" -ServiceUrl "https://$(externalApiCustomHostname)"' azurePowerShellVersion: LatestVersion @@ -121,7 +122,7 @@ jobs: - task: AzurePowerShell@5 displayName: 'Set API Level Policy' inputs: - azureSubscription: ${{ parameters.ServiceConnection }} + azureSubscription: ${{ parameters.LegacyApimServiceConnection }} ScriptPath: $(Pipeline.Workspace)/SFA.DAS.AssessorService/azure/scripts/Set-ApimApiPolicy.ps1 ScriptArguments: '-ResourceGroupName "$(ApimResourceGroup)" -ServiceName "$(ApimServiceName)" -ApiId "$(externalApiApiId)" -ApimApiPolicyFilePath "$(ApimApiPolicyFilePath)"' azurePowerShellVersion: LatestVersion @@ -176,7 +177,7 @@ jobs: - task: AzurePowerShell@5 displayName: 'Import Swagger Definition' inputs: - azureSubscription: ${{ parameters.ServiceConnection }} + azureSubscription: 'NAS Pre-Prod (ARM)' ScriptPath: $(Pipeline.Workspace)/SFA.DAS.AssessorService/azure/scripts/Import-APIMSwaggerApiDefinition.ps1 ScriptArguments: '-ResourceGroupName "$(ApimResourceGroup)" -ServiceName "$(ApimServiceName)" -ApiId "$(externalApiSandboxApiId)" -SwaggerSpecificationUrl "$(externalApiSandboxSwaggerUrl)" -ApiUrlSuffix "$(externalApiSandboxUrlSuffix)" -ServiceUrl "https://$(externalApiSandboxCustomHostname)"' azurePowerShellVersion: LatestVersion @@ -184,7 +185,7 @@ jobs: - task: AzurePowerShell@5 displayName: 'Set API Level Policy' inputs: - azureSubscription: ${{ parameters.ServiceConnection }} + azureSubscription: 'NAS Pre-Prod (ARM)' ScriptPath: $(Pipeline.Workspace)/SFA.DAS.AssessorService/azure/scripts/Set-ApimApiPolicy.ps1 ScriptArguments: '-ResourceGroupName "$(ApimResourceGroup)" -ServiceName "$(ApimServiceName)" -ApiId "$(externalApiSandboxApiId)" -ApimApiPolicyFilePath "$(ApimApiPolicyFilePath)"' azurePowerShellVersion: LatestVersion