Import TF Resources

.github/workflows/import_resources_to_tf.yml

@@ -0,0 +1,44 @@
+---
+name: Import TF Resources
+
+on:
+  workflow_dispatch:
+
+jobs:
+  deploy_management:
+    name: Import TF Resources
+    runs-on: ubuntu-latest
+    environment: Dev
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Import Resources
+        uses: ./.github/actions/devcontainer_run_command
+        with:
+          COMMAND: "make terraform-import DIR=templates/core"
+          ACTIONS_ACR_NAME: ${{ secrets.ACTIONS_ACR_NAME }}
+          ACTIONS_ACR_PASSWORD: ${{ secrets.ACTIONS_ACR_PASSWORD }}
+          ARM_TENANT_ID: "${{ secrets.ARM_TENANT_ID }}"
+          ARM_CLIENT_ID: "${{ secrets.ARM_CLIENT_ID }}"
+          ARM_CLIENT_SECRET: "${{ secrets.ARM_CLIENT_SECRET }}"
+          ARM_SUBSCRIPTION_ID: "${{ secrets.ARM_SUBSCRIPTION_ID }}"
+          RESOURCE: "${{ secrets.API_CLIENT_ID }}"
+          AUTH_TENANT_ID: "${{ secrets.AAD_TENANT_ID }}"
+          TEST_APP_ID: "${{ secrets.TEST_APP_ID }}"
+          TEST_USER_NAME: "${{ secrets.TEST_USER_NAME }}"
+          TEST_USER_PASSWORD: "${{ secrets.TEST_USER_PASSWORD }}"
+          TEST_WORKSPACE_APP_ID: "${{ secrets.TEST_WORKSPACE_APP_ID }}"
+          TRE_ID: "${{ secrets.TRE_ID }}"
+          LOCATION: ${{ secrets.LOCATION }}
+          ACR_NAME: ${{ secrets.ACR_NAME }}
+          TF_VAR_terraform_state_container_name:
+            ${{ secrets.TF_STATE_CONTAINER }}
+          TF_VAR_mgmt_resource_group_name: ${{ secrets.MGMT_RESOURCE_GROUP }}
+          TF_VAR_mgmt_storage_account_name:
+            ${{ secrets.STATE_STORAGE_ACCOUNT_NAME }}
+          TF_VAR_core_address_space: ${{ secrets.CORE_ADDRESS_SPACE }}
+          TF_VAR_tre_address_space: ${{ secrets.TRE_ADDRESS_SPACE }}
+          TF_VAR_swagger_ui_client_id: "${{ secrets.SWAGGER_UI_CLIENT_ID }}"
+          TF_VAR_api_client_id: "${{ secrets.API_CLIENT_ID }}"
+          TF_VAR_api_client_secret: "${{ secrets.API_CLIENT_SECRET }}"

templates/core/terraform/import.sh

@@ -12,4 +12,12 @@ terraform init -input=false -backend=true -reconfigure -upgrade \
     -backend-config="container_name=$TF_VAR_terraform_state_container_name" \
     -backend-config="key=${TRE_ID}"
 
-terraform import ...
+# terraform import module.jumpbox.azurerm_key_vault_secret.jumpbox_credentials "https://kv-${TRE_ID}.vault.azure.net/secrets/vm-${TRE_ID}-jumpbox-admin-credentials/e6ae209811894395bd50a846e18d1782"
+
+# terraform import module.appgateway.azurerm_key_vault_certificate.tlscert "https://kv-${TRE_ID}.vault.azure.net/certificates/letsencrypt/6e5a17562a464283804cc9795479cfb7"
+
+# terraform import module.resource_processor_vmss_porter[0].azurerm_key_vault_secret.resource_processor_vmss_password "https://kv-${TRE_ID}.vault.azure.net/secrets/resource-processor-vmss-password/27d8225bd9ba49369cf40d607732bd9c"
+
+terraform import module.gitea[0].azurerm_key_vault_secret.gitea_password "https://kv-${TRE_ID}.vault.azure.net/secrets/gitea-${TRE_ID}-admin-password/666122b4526447fda428b2bc3f1fff23"
+
+terraform import module.gitea[0].azurerm_key_vault_secret.db_password "https://kv-${TRE_ID}.vault.azure.net/secrets/mysql-${TRE_ID}-password/cf5414d7b3fa4da79f5ce8e6a62c7a8e"

templates/core/terraform/keyvault/keyvault.tf

@@ -17,7 +17,7 @@ resource "azurerm_key_vault_access_policy" "deployer" {
   object_id    = data.azurerm_client_config.deployer.object_id
 
   key_permissions         = ["Get", "List", "Update", "Create", "Import", "Delete"]
-  secret_permissions      = ["Get", "List", "Set", "Delete", "Purge"]
+  secret_permissions      = ["Get", "List", "Set", "Delete", "Purge", "Recover"]
   certificate_permissions = ["Get", "List", "Update", "Create", "Import", "Delete", "Purge"]
   storage_permissions     = ["Get", "List", "Update", "Delete"]
 }