From f4e39be8281c787d5f4f87bc3727e1901bdcf8c1 Mon Sep 17 00:00:00 2001 From: Administrator Date: Tue, 15 Oct 2024 14:12:40 -0600 Subject: [PATCH] moved everything to base --- .github/workflows/deploy-dev.yml | 6 +----- ops/terraform/variables.tf | 17 ----------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index afddb4cd..737e5d76 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -28,9 +28,7 @@ env: NODE_VERSION: 20 APP_NAME: reportversion DEPLOY_ENV: dev2 - SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} - + jobs: build_publish_ocr: runs-on: ubuntu-latest @@ -81,9 +79,7 @@ jobs: env: RESOURCE_GROUP_NAME: ${{ env.APP_NAME}}-rg-${{ env.DEPLOY_ENV }} run: | - # echo subscription_id=\""$SUBSCRIPTION_ID"\" >> terraform.tfvars echo resource_group_name=\""$RESOURCE_GROUP_NAME"\" >> terraform.tfvars - # echo client_id=\""$CLIENT_ID"\" >> terraform.tfvars echo name=\""$APP_NAME"\" >> terraform.tfvars az config set defaults.group=$RESOURCE_GROUP_NAME - name: Set environment diff --git a/ops/terraform/variables.tf b/ops/terraform/variables.tf index 12fa3c86..860fea7d 100644 --- a/ops/terraform/variables.tf +++ b/ops/terraform/variables.tf @@ -2,22 +2,5 @@ variable "resource_group_name" { description = "value of the Azure resource group to deploy to" } -variable "subscription_id" { - description = "value of the Azure Subscription ID to use" -} - -variable "client_id" { - description = "Client ID" -} - -variable "docker_tag" { -} - -variable "docker_registry_path" { -} - -variable "docker_registry_url" { -} - variable "name" { } \ No newline at end of file