Skip to content

Commit

Permalink
Bring in HotFix repairs (Azure#651)
Browse files Browse the repository at this point in the history
* Refactor deploy control plane script to remove unnecessary Terraform installation and Azure CLI installation

* Refactor deploy control plane script to include sourcing deploy_server.sh and fixing Terraform ownership

* Refactor deploy control plane script to include sourcing deploy_server.sh and fixing Terraform ownership

* Refactor deploy control plane script to include azurerm_role_assignment for deployer and storage_sapbits_contributor

* Refactor deploy control plane script to remove unnecessary Terraform installation and Azure CLI installation

* Refactor deploy control plane script to include sourcing deploy_server.sh and fixing Terraform ownership

* Refactor deploy control plane script to include dynamic role assignment based on VM count

* Refactor deploy scripts to simplify checkIfCloudShell function

* Refactor deploy control plane script to include dynamic role assignment based on VM count and use managed service identity (MSI) for authentication

* Refactor deploy scripts to include sourcing deploy_server.sh and fixing Terraform ownership

* Refactor deploy control plane script to include dynamic role assignment based on VM count and use managed service identity (MSI) for authentication

* Refactor deploy control plane script to include dynamic role assignment based on VM count and use managed service identity (MSI) for authentication

* handle the realfilepath and the scriptdir variables as they might be replaced with other values in child scripts

* Refactor deploy_controlplane.sh to use managed service identity (MSI) for authentication

* Refactor deploy_controlplane.sh to remove ARM_USE_MSI variable and use managed service identity (MSI) for authentication

* Refactor deploy_utils.sh to remove ARM_USE_MSI variable and use managed service identity (MSI) for authentication

* Refactor deploy_controlplane.sh to remove ARM_USE_MSI variable and use managed service identity (MSI) for authentication

* Refactor deploy_controlplane.sh to use managed service identity (MSI) for authentication

* Refactor installer.sh to include terraform output command

* Refactor installer.sh to comment out unnecessary terraform output command

* Refactor variables_local.tf to use client_id instead of id for service principal object_id

* Refactor deploy_controlplane.sh to use managed service identity (MSI) for authentication and remove unnecessary ARM_USE_MSI variable

* Refactor deploy_controlplane.sh to use managed service identity (MSI) for authentication

* chore: include OpenSSF Scorecard badge

* Refactor variables_local.tf to use client_id instead of id for service principal object_id
Refactor installer.sh to comment out unnecessary terraform output command

* Refactor pipeline script to use correct variable for workload ARM subscription ID

* Refactor pipeline script to use correct variable for workload ARM subscription ID

* Refactor pipeline script to include ARM_OBJECT_ID variable

* Refactor pipeline script to use correct variable for workload ARM_CLIENT_ID

* Refactor pipeline script to use correct variable for workload ARM_CLIENT_ID

* check terraform when running in cloudshell

* Refactor pipeline script to include missing variable checks

* Refactor pipeline script to remove unnecessary variable checks

* Refactor pipeline script to use correct variables for workload ARM_CLIENT_ID

* Refactor pipeline script to use correct variables for workload ARM_CLIENT_ID

* Refactor pipeline script to include missing variable checks

* Refactor pipeline script to update echo statements for installation method

* Refactor pipeline script to update echo statements for installation method

* Refactor pipeline script to use correct variables for workload ARM_CLIENT_ID

* Refactor pipeline script to update echo statements for installation method

* Refactor pipeline script to update echo statements for installation method

* Refactor pipeline script to update echo statements for installation method and use correct variables for workload ARM_CLIENT_ID

* Refactor pipeline script to update echo statements for installation method and use correct variables for workload ARM_CLIENT_ID

* Refactor pipeline script to update echo statements for installation method and use correct variables for workload ARM_CLIENT_ID

* Refactor pipeline script to update echo statements for installation method and use correct variables for workload ARM_CLIENT_ID

* Refactor pipeline script to update echo statements for installation method and use correct variables for workload ARM_CLIENT_ID

* Refactor pipeline script

* Refactor pipeline script to update echo statements for installation method and use correct variables for workload ARM_CLIENT_ID

* Refactor pipeline script to update echo statements and export variables for installation method and workload ARM_CLIENT_ID

* Refactor pipeline script to update PATH variable in deploy_controlplane.sh

* Refactor pipeline script to update echo statements and export variables for installation method, workload ARM_CLIENT_ID, and Terraform state information

* Refactor pipeline script to update echo statements and export variables for installation method, workload ARM_CLIENT_ID, and Terraform state information

* Refactor pipeline script to update echo statement for displaying the key vault information

* Refactor pipeline script to update echo statements and export variables for installation method, workload ARM_CLIENT_ID, and Terraform state information

* Refactor pipeline script to update usage of Azure CLI command in installer.sh

* Refactor pipeline script to update echo statements and export variables for installation method, workload ARM_CLIENT_ID, and Terraform state information

* Refactor pipeline script to update echo statements and export variables for installation method, workload ARM_CLIENT_ID, and Terraform state information

* Refactor pipeline script to update echo statements and export variables for installation method, workload ARM_CLIENT_ID, and Terraform state information

* Refactor pipeline script to update echo statements and export variables for installation method, workload ARM_CLIENT_ID, and Terraform state information

* Refactor pipeline script to update echo statements and export variables for installation method, workload ARM_CLIENT_ID, and Terraform state information

* Refactor pipeline script to update echo statements and export variables for installation method, workload ARM_CLIENT_ID, and Terraform state information

* Refactor pipeline script to update echo statements and export variables for installation method, workload ARM_CLIENT_ID, and Terraform state information

* Refactor provider configuration to use Azure Key Vault for subscription ID retrieval

* Fixes Azure#1: Added a new line to the installer script

* Refactor pipeline script to fix unzip command in deploy control plane stage

* Refactor pipeline script to update echo statements and export variables for installation method, workload ARM_CLIENT_ID, and Terraform state information

* Refactor deploy_controlplane.sh script to save deployer_tfstate_key in config information

* remove the deployer provider

* Refactor deploy_controlplane.sh script to use the azurerm.deployer provider for retrieving key vault secrets

* Refactor tfvar_variables.tf to add "tags" variable for providing tags to all resources

* Refactor providers.tf to use local variable for subscription_id in deployer provider

* Refactor providers.tf to remove subscription_id from deployer provider

* Refactor deploy_controlplane.sh script to use local variables for deployer and library state file keys

* Refactor deploy_controlplane.sh script to use local variables for deployer and library state file keys

* Refactor azurerm provider versions to 4.6.0

* Refactor deploy_controlplane.sh script to use local variables for deployer and library state file keys

* Refactor deploy_controlplane.sh script to use local variables for deployer and library state file keys

* Refactor deploy_controlplane.sh script to use local variables for deployer and library state file keys

* Refactor az keyvault set-policy command in deploy_controlplane.sh script

* Refactor az keyvault set-policy command in deploy_controlplane.sh script

* Add SPN to workload zone key vault

* Remove the permission setting from the pipeline

* Refactor echo statements in script_helpers.sh and installer.sh

* Refactor echo statements in script_helpers.sh and installer.sh

* Refactor echo statements in script_helpers.sh and installer.sh

* Refactor echo statements in script_helpers.sh and installer.sh

* Refactor echo statements in script_helpers.sh and installer.sh

* Refactor echo statements in script_helpers.sh and installer.sh

* Refactor echo statements in script_helpers.sh and installer.sh

* Refactor echo statements in deploy_utils.sh for better readability

* Refactor echo statement in 03-sap-system-deployment.yaml

* Refactor echo statement in 03-sap-system-deployment.yaml for better readability

* Refactor echo statement in 03-sap-system-deployment.yaml for better readability

* Refactor echo statements for better readability and consistency

* Refactor echo statements for better readability and consistency

* Refactor echo statements for better readability and consistency

* Refactor echo statements for better readability and consistency

* Refactor echo statements for better readability and consistency

* Refactor echo statements for better readability and consistency

* Refactor echo statements for better readability and consistency

* Refactor echo statements to use variable for workload TFvars

* Refactor echo statements to use variable for workload TFvars

* Refactor echo statements to use variable for workload TFvars

* Refactor echo statement to use variable for Terraform Storage Account Id

* Refactor echo statements to use variables for Terraform details

* Refactor echo statements to use variables for Terraform details

* Refactor echo statements to use variables for Terraform details

* Refactor echo statements to use variables consistently

* Refactor echo statements to use variables consistently

* Refactor echo statements to use variables consistently and for Terraform details

* Refactor echo statements to consistently use variables

* Refactor echo statements to consistently use variables and improve Terraform details

* Refactor echo statements to consistently use variables and improve Terraform details

* Refactor echo statements to consistently use variables and improve Terraform details

* Refactor echo statements to consistently use variables and improve Terraform details

* Debugging

* Refactor echo statements to consistently use variables and improve Terraform details

* Refactor echo statements to consistently use variables and improve Terraform details

* Refactor echo statements to consistently use variables and improve Terraform details

* trimming

* Refactor echo statements to consistently use variables and improve Terraform details

* Refactor echo statements to consistently use variables and improve Terraform details

* Refactor echo statements to consistently use variables and improve Terraform details

* Refactor echo statements to consistently use variables and improve Terraform details

* Refactor echo statements to consistently use variables and improve Terraform details

* Refactor echo statements to consistently use variables and improve Terraform details

* Refactor echo statements to consistently use variables and improve Terraform details

* Refactor echo statements to consistently use variables and improve formatting

* Refactor echo statements to consistently use variables and improve formatting

* terraform

* Refactor echo statements to consistently use variables and improve Terraform details

* Refactor echo statements to consistently use variables and improve formatting

* Refactor echo statements to consistently use variables and improve formatting

* Refactor echo statements to consistently use variables and improve Terraform details

* Refactor providers.tf to use Managed Service Identity (MSI) for authentication

* Refactor echo statements to consistently use variables and improve formatting

* Refactor echo statement to improve parameter file formatting

* Refactor echo statements to improve formatting and use variables consistently

* Refactor echo statements to consistently use variables and improve formatting

* Refactor deploy control plane pipeline to improve configuration and extension installation

* Refactor providers.tf to use remote state for subscription ID

* Refactor echo statements to consistently use variables and improve formatting

* Refactor echo statements to consistently use variables and improve formatting
Refactor providers.tf to use remote state for subscription ID
Refactor deploy control plane pipeline to improve configuration and extension installation
Fix validation issue in script_helpers.sh
Update providers.tf to handle null subscription ID
Remove unused variable in variables_local.tf

* Refactor echo statement to improve formatting in deploy_controlplane.sh

* Refactor echo statements to improve formatting in deploy_controlplane.sh and script_helpers.sh

* Refactor deploy_controlplane.sh and script_helpers.sh echo statements for improved formatting

* Refactor key vault secrets to include service principal access

* Refactor key vault secrets to include service principal access

* Refactor key vault secrets to include service principal access

* Refactor key vault secrets to include service principal access

* Refactor echo statements for improved formatting in deploy_controlplane.sh and script_helpers.sh

* Refactor permissions assignment in deploy_controlplane.sh

* Refactor echo statements for improved formatting and include deployer subscription

* Refactor echo statements for improved formatting and include deployer subscription

* Refactor echo statements for improved formatting and include deployer subscription

* Change to use ARM CLIENT ID

* Refactor echo statement to include deployer subscription in 02-sap-workload-zone.yaml

* Refactor echo statements for improved formatting and include deployer subscription in 02-sap-workload-zone.yaml

* Refactor echo statements for improved formatting and include deployer subscription in 02-sap-workload-zone.yaml

* Refactor echo statements for improved formatting and include deployer subscription in 02-sap-workload-zone.yaml

* Refactor echo statements and include deployer subscription in 02-sap-workload-zone.yaml
Change to use WL_ARM_CLIENT_ID instead of ARM_CLIENT_ID
Update variable group and variable names in New-SDAFDevopsWorkloadZone.ps1
Update echo statements in script_helpers.sh for improved formatting

* Refactor echo statements for improved formatting and include deployer subscription in 02-sap-workload-zone.yaml

* Refactor echo statements for improved formatting and include deployer subscription in 03-sap-system-deployment.yaml

* Refactor echo statements for improved formatting and include deployer subscription in 03-sap-system-deployment.yaml

* indentation

* Refactor echo statements for improved formatting and include deployer subscription in 03-sap-system-deployment.yaml

* Refactor echo statements for improved formatting and include deployer subscription in 03-sap-system-deployment.yaml

* Refactor echo statements for improved formatting and include deployer subscription in 03-sap-system-deployment.yaml

* Refactor echo statements for improved formatting and fix indentation in 10-remover-terraform.yaml

* Refactor echo statement for improved formatting in remover.sh

* Refactor echo statements for improved formatting and remove unnecessary output in remover.sh and 10-remover-terraform.yaml

* Refactor echo statements for improved formatting and remove unnecessary output in remover.sh and 10-remover-terraform.yaml

* Refactor echo statements for improved formatting and remove unnecessary output in remover.sh and 10-remover-terraform.yaml

* Refactor echo statements for improved formatting and remove unnecessary output in 01-deploy-control-plane.yaml

* Refactor validate_dependencies function to check for the existence of the terraform binary file instead of the terraform directory.

* Refactor echo statements for improved formatting and remove unnecessary output in deploy and remove pipelines

* Refactor echo statements for improved formatting and remove unnecessary output in deploy and remove pipelines

* Refactor echo statements for improved formatting and remove unnecessary output in set_secrets.sh

* Refactor azuread_service_principal data source to conditionally include object_id in locals

* Update SDAF version to 3.13.1.0 in ansible-input-api.yaml and version.txt

* Refactor echo statements for improved formatting and remove unnecessary output in deploy and remove pipelines

* Refactor echo statements for improved formatting and remove unnecessary output in deploy and remove pipelines

* Refactor key_vault_sap_landscape.tf to conditionally include object_id in azurerm_key_vault_access_policy

* Refactor echo statements for improved formatting and remove unnecessary output in deploy and remove pipelines

* Refactor key_vault_sap_landscape.tf to conditionally include object_id in azurerm_key_vault_access_policy

* Refactor key_vault_sap_landscape.tf to conditionally include object_id in azurerm_key_vault_access_policy

* Refactor echo statements for improved formatting and remove unnecessary output in deploy and remove pipelines

* Refactor echo statements for improved formatting and remove unnecessary output in deploy and remove pipelines

* Refactor echo statements for improved formatting and remove unnecessary output in deploy and remove pipelines

* Refactor echo statements for improved formatting in installer.sh

* Refactor echo statements for improved formatting and remove unnecessary output in installer.sh

* Refactor echo statements for improved formatting and remove unnecessary output in set_secrets.sh

* Refactor echo statements for improved formatting and remove unnecessary output in installer.sh and providers.tf

* Refactor echo statements for improved formatting and remove unnecessary output in installer.sh

* Refactor installer.sh to fix path issue and pass parameters correctly

* Refactor deploy_controlplane.sh to include state subscription parameter in installer.sh call

* Refactor deploy_controlplane.sh to include correct subscription parameter in installer.sh call

* Refactor deploy_controlplane.sh to include deployer subscription parameter and persist parameters

* Refactor deploy_controlplane.sh to include state subscription parameter in installer.sh call

* Refactor deploy_controlplane.sh to include state subscription parameter in installer.sh call

* Refactor deploy_controlplane.sh to include correct subscription parameter in installer.sh call

* Refactor deploy_controlplane.sh to include correct subscription parameter in installer.sh call and handle storage account authentication

* Refactor deploy_controlplane.sh to remove unnecessary echo statement

* Refactor deploy_controlplane.sh to remove unnecessary echo statements and improve parameter handling

* Refactor deploy_controlplane.sh to improve parameter handling

* Refactor deploy_controlplane.sh to improve storage account authentication handling

* Refactor deploy_controlplane.sh to improve parameter handling and remove unnecessary echo statements

* Refactor deploy_utils.sh to fix variable value retrieval from config file

* Refactor parameter handling in script_helpers.sh and install_workloadzone.sh

* Refactor install_workloadzone.sh to handle unknown region codes

* Refactor install_workloadzone.sh to handle unknown region codes

* Refactor install_workloadzone.sh to handle unknown region codes and improve parameter handling

* Refactor install_workloadzone.sh to handle unknown region codes and improve parameter handling

* Refactor region code handling in deploy_utils.sh and script_helpers.sh

* Refactor install_workloadzone.sh to handle unknown region codes and improve parameter handling

* Refactor install_workloadzone.sh to handle unknown region codes and improve parameter handling

* Refactor install_workloadzone.sh to handle unknown region codes and improve parameter handling

* Refactor install_workloadzone.sh to handle unknown region codes and improve parameter handling

* Refactor install_workloadzone.sh to improve parameter handling and region code handling in deploy_utils.sh and script_helpers.sh

* Refactor install_workloadzone.sh to improve parameter handling and region code handling

* Refactor install_workloadzone.sh to improve parameter handling and region code handling

* Refactor install_workloadzone.sh to improve parameter handling and region code handling

* Refactor install_workloadzone.sh to improve parameter handling and region code handling

* Refactor install_workloadzone.sh to improve parameter handling and region code handling

* Refactor install_workloadzone.sh to remove unnecessary code

* Refactor echo statements to improve readability and consistency

* Refactor installer.sh to improve parameter handling and region code handling

* Refactor installer.sh to improve parameter handling and region code handling

* Refactor installer.sh to remove unnecessary echo statements

* Refactor installer.sh to improve parameter handling and region code handling

* Refactor storage_accounts.tf to include var.use_private_endpoint in the count condition

* Refactor storage_accounts.tf to include var.use_private_endpoint in the count condition

* Keyvault network rules

* Refactor key_vault_sap_landscape.tf to include var.enable_firewall_for_keyvaults_and_storage in the default_action condition

* Refactor installer.sh to handle empty SPN secret in set_executing_user_environment_variables

* Refactor installer.sh to handle empty SPN secret in set_executing_user_environment_variables

* Refactor module.tf to include enable_firewall_for_keyvaults_and_storage variable

* Refactor installer.sh to handle empty SPN secret in set_executing_user_environment_variables and remove error file

* Add Terraform output detaisl

* Refactor Terraform plugin cache directory handling

* Refactor Terraform destroy command in remover.sh

* Refactor Terraform destroy command in remover.sh

* Refactor echo statement in deploy pipeline to include return code from deployment

* Refactor echo statement in deploy pipeline to include return code from deployment

---------

Co-authored-by: Kimmo Forss <[email protected]>
Co-authored-by: hdamecharla <[email protected]>
  • Loading branch information
3 people committed Nov 12, 2024
1 parent c8c6469 commit f66ae29
Show file tree
Hide file tree
Showing 7 changed files with 3,876 additions and 3,849 deletions.
2,138 changes: 1,067 additions & 1,071 deletions deploy/pipelines/01-deploy-control-plane.yaml

Large diffs are not rendered by default.

Loading

0 comments on commit f66ae29

Please sign in to comment.