diff --git a/.ci/gcb-push-downstream.yml b/.ci/gcb-push-downstream.yml index 01d6a9611310..ea3901f5bc82 100644 --- a/.ci/gcb-push-downstream.yml +++ b/.ci/gcb-push-downstream.yml @@ -136,34 +136,6 @@ steps: - -c - git push https://modular-magician:$$GITHUB_TOKEN@github.com/GoogleCloudPlatform/magic-modules $COMMIT_SHA:tf-oics-sync - # TF-CLOUD-DOCS - - name: 'gcr.io/graphite-docker-images/downstream-waiter' - id: tf-cloud-docs-sync - secretEnv: ["GITHUB_TOKEN"] - waitFor: ["checkout"] - args: - - 'tf-cloud-docs-sync' - - $BRANCH_NAME - - $COMMIT_SHA - - - name: 'gcr.io/graphite-docker-images/downstream-builder' - secretEnv: ["GITHUB_TOKEN"] - id: tf-cloud-docs-push - waitFor: ["tf-cloud-docs-sync"] - args: - - 'downstream' - - 'tf-cloud-docs' - - 'beta' - - $COMMIT_SHA - - - name: 'gcr.io/cloud-builders/git' - waitFor: ["tf-cloud-docs-push"] - secretEnv: ["GITHUB_TOKEN"] - entrypoint: 'bash' - args: - - -c - - git push https://modular-magician:$$GITHUB_TOKEN@github.com/GoogleCloudPlatform/magic-modules $COMMIT_SHA:tf-cloud-docs-sync - - name: 'gcr.io/graphite-docker-images/vcr-cassette-merger' secretEnv: ["GITHUB_TOKEN", "GOOGLE_PROJECT"] waitFor: ["tpg-push"] diff --git a/mmv1/provider/terraform_cloud_docs.rb b/mmv1/provider/terraform_cloud_docs.rb index 17b3e517d5ed..ba1766f5f257 100644 --- a/mmv1/provider/terraform_cloud_docs.rb +++ b/mmv1/provider/terraform_cloud_docs.rb @@ -28,30 +28,7 @@ def generate(output_folder, types, _product_path, _dump_yaml, generate_code, gen end # Create a directory of examples per resource - def generate_resource(pwd, data, _generate_code, generate_docs) - return unless generate_docs - - examples = data.object.examples - - examples.each do |example| - target_folder = data.output_folder - target_folder = File.join(target_folder, example.name) - FileUtils.mkpath target_folder - - data.example = example - - File.open(pwd + '/' + example.config_path).each_line do |line| - next unless line.include? '# [START' - - Google::LOGGER.info "Found CGC sample #{example.name}" - data.generate(pwd, - 'templates/terraform/examples/base_configs/cloud_docs_example_file.tf.erb', - File.join(target_folder, 'main.tf'), - self) - break - end - end - end + def generate_resource(pwd, data, _generate_code, generate_docs) end # We don't want to generate anything but the resource. def generate_resource_tests(pwd, data) end diff --git a/mmv1/templates/terraform/examples/sql_database_instance_postgres.tf.erb b/mmv1/templates/terraform/examples/sql_database_instance_postgres.tf.erb index 1e2cd4839c10..f5b8acd100f6 100644 --- a/mmv1/templates/terraform/examples/sql_database_instance_postgres.tf.erb +++ b/mmv1/templates/terraform/examples/sql_database_instance_postgres.tf.erb @@ -1,4 +1,5 @@ # [START cloud_sql_postgres_instance_80_db_n1_s2] +# Testing CGC-only change resource "google_sql_database_instance" "<%= ctx[:primary_resource_id] %>" { name = "<%= ctx[:vars]['database_instance_name'] %>" region = "us-central1"