fix: transform 1-data-ingestion into module base-data-ingestion (#72)

GoogleCloudPlatform · Jul 29, 2021 · a6e0af0 · a6e0af0
1 parent 12bb160
commit a6e0af0
Show file tree

Hide file tree

Showing 20 changed files with 14 additions and 14 deletions.
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -43,17 +43,17 @@ steps:
   - 'TF_VAR_org_id=$_ORG_ID'
 - id: create-data-ingestion
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && export TF_VAR_access_context_manager_policy_id=$(gcloud access-context-manager policies list --organization="${TF_VAR_org_id:?}" --format="value(name)") && kitchen_do create 1-data-ingestion']
+  args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && export TF_VAR_access_context_manager_policy_id=$(gcloud access-context-manager policies list --organization="${TF_VAR_org_id:?}" --format="value(name)") && kitchen_do create base-data-ingestion']
   env:
   - 'TF_VAR_org_id=$_ORG_ID'
 - id: converge-data-ingestion
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && export TF_VAR_access_context_manager_policy_id=$(gcloud access-context-manager policies list --organization="${TF_VAR_org_id:?}" --format="value(name)") && kitchen_do converge 1-data-ingestion']
+  args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && export TF_VAR_access_context_manager_policy_id=$(gcloud access-context-manager policies list --organization="${TF_VAR_org_id:?}" --format="value(name)") && kitchen_do converge base-data-ingestion']
   env:
   - 'TF_VAR_org_id=$_ORG_ID'
 - id: verify-data-ingestion
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && export TF_VAR_access_context_manager_policy_id=$(gcloud access-context-manager policies list --organization="${TF_VAR_org_id:?}" --format="value(name)") && kitchen_do verify 1-data-ingestion']
+  args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && export TF_VAR_access_context_manager_policy_id=$(gcloud access-context-manager policies list --organization="${TF_VAR_org_id:?}" --format="value(name)") && kitchen_do verify base-data-ingestion']
   env:
   - 'TF_VAR_org_id=$_ORG_ID'
 - id: create-de-identification-template
@@ -112,7 +112,7 @@ steps:
   args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy de-identification-template']
 - id: destroy-data-ingestion
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && export TF_VAR_access_context_manager_policy_id=$(gcloud access-context-manager policies list --organization="${TF_VAR_org_id:?}" --format="value(name)") && kitchen_do destroy 1-data-ingestion']
+  args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && export TF_VAR_access_context_manager_policy_id=$(gcloud access-context-manager policies list --organization="${TF_VAR_org_id:?}" --format="value(name)") && kitchen_do destroy base-data-ingestion']
   env:
   - 'TF_VAR_org_id=$_ORG_ID'
 - id: create-org-policies

diff --git a/examples/batch-data-ingestion/README.md b/examples/batch-data-ingestion/README.md
@@ -1,10 +1,10 @@
 # Dataflow with DLP de-identification
 
-This example illustrates how to run a Dataflow job that uses the `de_identification_template` submodule with the `1-data-ingestion` step.
+This example illustrates how to run a Dataflow job that uses the `de_identification_template` submodule with the `base-data-ingestion` submodule.
 
 ## Prerequisites
 
-1. 1-data-ingestion executed successfully.
+1. base-data-ingestion executed successfully.
 2. A `crypto_key` and `wrapped_key` pair.  Contact your Security Team to obtain the pair. The `crypto_key` location must be the same location used for the `dlp_location`.
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

diff --git a/examples/dataflow-with-dlp/README.md b/examples/dataflow-with-dlp/README.md
@@ -1,10 +1,10 @@
 # Dataflow with DLP de-identification
 
-This example illustrates how to run a Dataflow job that uses the `de_identification_template` submodule with the `1-data-ingestion` step.
+This example illustrates how to run a Dataflow job that uses the `de_identification_template` submodule with the `base-data-ingestion` submodule.
 
 ## Prerequisites
 
-1. 1-data-ingestion executed successfully.
+1. base-data-ingestion executed successfully.
 2. A `crypto_key` and `wrapped_key` pair.  Contact your Security Team to obtain the pair. The `crypto_key` location must be the same location used for the `dlp_location`.
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

diff --git a/kitchen.yml b/kitchen.yml
@@ -26,13 +26,13 @@ platforms:
   - name: default
 
 suites:
-  - name: 1-data-ingestion
+  - name: base-data-ingestion
     driver:
-      root_module_directory: test/fixtures/1-data-ingestion/
+      root_module_directory: test/fixtures/base-data-ingestion/
     verifier:
       color: false
       systems:
-        - name: 1-data_ingestion gcp
+        - name: base_data_ingestion gcp
           backend: gcp
           controls:
             - gcp

diff --git a/1-data-ingestion/README.md → modules/base-data-ingestion/README.md b/1-data-ingestion/README.md → modules/base-data-ingestion/README.md
diff --git a/1-data-ingestion/dataflow_firewall.tf → .../base-data-ingestion/dataflow_firewall.tf b/1-data-ingestion/dataflow_firewall.tf → .../base-data-ingestion/dataflow_firewall.tf
diff --git a/1-data-ingestion/kms.tf → modules/base-data-ingestion/kms.tf b/1-data-ingestion/kms.tf → modules/base-data-ingestion/kms.tf
diff --git a/1-data-ingestion/main.tf → modules/base-data-ingestion/main.tf b/1-data-ingestion/main.tf → modules/base-data-ingestion/main.tf
diff --git a/1-data-ingestion/outputs.tf → modules/base-data-ingestion/outputs.tf b/1-data-ingestion/outputs.tf → modules/base-data-ingestion/outputs.tf
diff --git a/1-data-ingestion/providers.tf → modules/base-data-ingestion/providers.tf b/1-data-ingestion/providers.tf → modules/base-data-ingestion/providers.tf
diff --git a/1-data-ingestion/service_accounts.tf → ...s/base-data-ingestion/service_accounts.tf b/1-data-ingestion/service_accounts.tf → ...s/base-data-ingestion/service_accounts.tf
diff --git a/1-data-ingestion/variables.tf → modules/base-data-ingestion/variables.tf b/1-data-ingestion/variables.tf → modules/base-data-ingestion/variables.tf
diff --git a/1-data-ingestion/versions.tf → modules/base-data-ingestion/versions.tf b/1-data-ingestion/versions.tf → modules/base-data-ingestion/versions.tf
diff --git a/1-data-ingestion/vpc_service_control.tf → ...ase-data-ingestion/vpc_service_control.tf b/1-data-ingestion/vpc_service_control.tf → ...ase-data-ingestion/vpc_service_control.tf
@@ -24,7 +24,7 @@ locals {
 
 // vpc service controls
 module "vpc_service_controls" {
-  source = "..//modules/vpc_service_controls"
+  source = "../..//modules/vpc_service_controls"
 
   org_id                           = var.org_id
   project_id                       = var.project_id

diff --git a/test/fixtures/1-data-ingestion/main.tf → test/fixtures/base-data-ingestion/main.tf b/test/fixtures/1-data-ingestion/main.tf → test/fixtures/base-data-ingestion/main.tf
@@ -16,7 +16,7 @@
 
 
 module "data_ingestion" {
-  source                           = "../../../1-data-ingestion"
+  source                           = "../../..//modules/base-data-ingestion"
   bucket_name                      = var.bucket_name
   dataset_id                       = var.dataset_id
   org_id                           = var.org_id

diff --git a/test/fixtures/1-data-ingestion/outputs.tf → test/fixtures/base-data-ingestion/outputs.tf b/test/fixtures/1-data-ingestion/outputs.tf → test/fixtures/base-data-ingestion/outputs.tf
diff --git a/test/fixtures/1-data-ingestion/variables.tf → ...fixtures/base-data-ingestion/variables.tf b/test/fixtures/1-data-ingestion/variables.tf → ...fixtures/base-data-ingestion/variables.tf
diff --git a/test/fixtures/1-data-ingestion/versions.tf → .../fixtures/base-data-ingestion/versions.tf b/test/fixtures/1-data-ingestion/versions.tf → .../fixtures/base-data-ingestion/versions.tf
diff --git a/...egration/1-data-ingestion/controls/gcp.rb → ...ation/base-data-ingestion/controls/gcp.rb b/...egration/1-data-ingestion/controls/gcp.rb → ...ation/base-data-ingestion/controls/gcp.rb
diff --git a/test/integration/1-data-ingestion/inspec.yml → ...ntegration/base-data-ingestion/inspec.yml b/test/integration/1-data-ingestion/inspec.yml → ...ntegration/base-data-ingestion/inspec.yml
@@ -1,4 +1,4 @@
-name: 1-data-ingestion
+name: base-data-ingestion
 depends:
   - name: inspec-gcp
     git: https://github.com/inspec/inspec-gcp.git