diff --git a/.circleci/ci_integration.sh b/.circleci/ci_integration.sh new file mode 100755 index 0000000..9db1e7f --- /dev/null +++ b/.circleci/ci_integration.sh @@ -0,0 +1,54 @@ +#! /bin/bash +# Always clean up. +DELETE_AT_EXIT="$(mktemp -d)" + +finish() { + echo 'BEGIN: finish() trap handler' >&2 + set +e + bundle exec kitchen destroy + [[ -d "${DELETE_AT_EXIT}" ]] && rm -rf "${DELETE_AT_EXIT}" + echo 'END: finish() trap handler' >&2 +} + +setup_environment() { + local tmpfile + tmpfile="$(mktemp)" + + echo "$GOOGLE_APPLICATION_CREDENTIALS" > "${tmpfile}" + + # Terraform and most other tools respect GOOGLE_CREDENTIALS + export GOOGLE_CREDENTIALS="$GOOGLE_APPLICATION_CREDENTIALS" + + # gcloud variables + export CLOUDSDK_CORE_PROJECT="${PROJECT_ID}" + export GOOGLE_APPLICATION_CREDENTIALS="${tmpfile}" + + # Terraform input variables + export TF_VAR_project_id="${PROJECT_ID}" + TF_VAR_random_string_for_testing="${RANDOM_STRING_FOR_TESTING:-$(LC_ALL=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 5 | head -n 1)}" + export TF_VAR_random_string_for_testing + + # Setup auth for service account + gcloud auth activate-service-account --key-file="${tmpfile}" +} + +main() { + set -eu + # Setup trap handler to auto-cleanup + export TMPDIR="${DELETE_AT_EXIT}" + trap finish EXIT + + # Setup environment + setup_environment + + set -x + # Execute the test lifecycle + bundle exec kitchen create + bundle exec kitchen converge + bundle exec kitchen verify +} + +# if script is being executed and not sourced. +if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then + main "$@" +fi diff --git a/.circleci/config.yml b/.circleci/config.yml index 2b54480..c0f6933 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,55 +1,50 @@ env: &docker docker: - - image: leandevopsio/terratest:0.3 + - image: leandevopsio/buildenv:0.1 version: 2 jobs: check_terraform: <<: *docker steps: - - checkout + - checkout - run: - name: terraform init validate fmt + name: Run terraform init validate fmt command: make check_terraform - run: - name: Check Terraform configurations with tflint + name: Run tflint command: tflint - # run-tests: - # <<: *docker - # environment: - # BUNDLE_PATH: vendor + - run: + name: Run check_shell + command: make check_shell - # steps: - # - checkout - # - restore_cache: - # keys: - # - tf-gcp-network-{{ checksum "Gemfile.lock" }} + run-tests: + <<: *docker + environment: + BUNDLE_PATH: vendor - # - run: - # name: Bundle Install - # command: bundle check || bundle install + steps: + - checkout + - restore_cache: + keys: + - terraform-gcp-vpc-{{ checksum "Gemfile.lock" }} + - terraform-gcp-vpc- + - run: + name: Bundle Install + command: bundle check || bundle install + - save_cache: + key: terraform-gcp-vpc-{{ checksum "Gemfile.lock" }} + paths: + - vendor + - run: + name: Run test-kitchen cicle + command: .circleci/ci_integration.sh - # - save_cache: - # key: tf-gcp-network-{{ checksum "Gemfile.lock" }} - # paths: - # - vendor - - # - run: - # name: Run make to zip a function code - # command: make build - - # - run: - # name: Run rspec test - # command: make - workflows: version: 2 tf-workflow: jobs: - check_terraform - # - check_tflint: - # requires: - # - check_terraform # - request-run: # type: approval # requires: @@ -59,9 +54,9 @@ workflows: # filters: # branches: # ignore: master - # - run-tests: - # requires: - # - request-run + - run-tests: + requires: + - check_terraform # filters: # branches: # ignore: master \ No newline at end of file diff --git a/.gitignore b/.gitignore index 2cdda24..b894281 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,6 @@ crash.log **/inspec.lock **/.kitchen **/.kitchen.local.yml -**/Gemfile.lock # Ignore any .tfvars files that are generated automatically for each Terraform run. Most # .tfvars files are managed as part of configuration and so should be included in diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..0878461 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,309 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + aws-eventstream (1.0.3) + aws-sdk (2.11.333) + aws-sdk-resources (= 2.11.333) + aws-sdk-core (2.11.333) + aws-sigv4 (~> 1.0) + jmespath (~> 1.0) + aws-sdk-resources (2.11.333) + aws-sdk-core (= 2.11.333) + aws-sigv4 (1.1.0) + aws-eventstream (~> 1.0, >= 1.0.2) + azure_graph_rbac (0.17.1) + ms_rest_azure (~> 0.11.0) + azure_mgmt_key_vault (0.17.4) + ms_rest_azure (~> 0.11.0) + azure_mgmt_resources (0.17.6) + ms_rest_azure (~> 0.11.1) + builder (3.2.3) + coderay (1.1.2) + concurrent-ruby (1.1.5) + declarative (0.0.10) + declarative-option (0.1.0) + diff-lcs (1.3) + docker-api (1.34.2) + excon (>= 0.47.0) + multi_json + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + dry-configurable (0.8.3) + concurrent-ruby (~> 1.0) + dry-core (~> 0.4, >= 0.4.7) + dry-container (0.7.2) + concurrent-ruby (~> 1.0) + dry-configurable (~> 0.1, >= 0.1.3) + dry-core (0.4.9) + concurrent-ruby (~> 1.0) + dry-equalizer (0.2.2) + dry-inflector (0.1.2) + dry-logic (0.6.1) + concurrent-ruby (~> 1.0) + dry-core (~> 0.2) + dry-equalizer (~> 0.2) + dry-types (0.14.1) + concurrent-ruby (~> 1.0) + dry-container (~> 0.3) + dry-core (~> 0.4, >= 0.4.4) + dry-equalizer (~> 0.2) + dry-inflector (~> 0.1, >= 0.1.2) + dry-logic (~> 0.5, >= 0.5) + dry-validation (0.13.0) + concurrent-ruby (~> 1.0) + dry-configurable (~> 0.1, >= 0.1.3) + dry-core (~> 0.2, >= 0.2.1) + dry-equalizer (~> 0.2) + dry-logic (~> 0.5, >= 0.5.0) + dry-types (~> 0.14, >= 0.14) + equatable (0.6.1) + erubis (2.7.0) + excon (0.66.0) + faraday (0.15.4) + multipart-post (>= 1.2, < 3) + faraday-cookie_jar (0.0.6) + faraday (>= 0.7.4) + http-cookie (~> 1.0.0) + faraday_middleware (0.12.2) + faraday (>= 0.7.4, < 1.0) + ffi (1.11.1) + google-api-client (0.23.9) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.5, < 0.7.0) + httpclient (>= 2.8.1, < 3.0) + mime-types (~> 3.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + signet (~> 0.9) + googleauth (0.6.7) + faraday (~> 0.12) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (~> 0.7) + gssapi (1.3.0) + ffi (>= 1.0.1) + gyoku (1.3.1) + builder (>= 2.1.2) + hashie (3.6.0) + htmlentities (4.3.4) + http-cookie (1.0.3) + domain_name (~> 0.5) + httpclient (2.8.3) + inifile (3.0.0) + inspec (3.9.3) + addressable (~> 2.4) + faraday (>= 0.9.0) + faraday_middleware (~> 0.12.2) + hashie (~> 3.4) + htmlentities + json (>= 1.8, < 3.0) + method_source (~> 0.8) + mixlib-log + multipart-post + parallel (~> 1.9) + parslet (~> 1.5) + pry (~> 0) + rspec (~> 3) + rspec-its (~> 1.2) + rubyzip (~> 1.2, >= 1.2.2) + semverse + sslshake (~> 1.2) + term-ansicolor + thor (~> 0.20) + tomlrb (~> 1.2) + train (~> 1.5, >= 1.7.2) + train-habitat (~> 0.1) + tty-prompt (~> 0.17) + tty-table (~> 0.10) + jmespath (1.4.0) + json (2.1.0) + jwt (2.2.1) + kitchen-terraform (4.9.0) + dry-types (~> 0.14.0) + dry-validation (= 0.13.0) + inspec (~> 3.0) + json (~> 2.1.0) + mixlib-shellout (~> 2.2) + test-kitchen (~> 1.23) + tty-which (~> 0.4.0) + license-acceptance (1.0.13) + pastel (~> 0.7) + tomlrb (~> 1.2) + tty-box (~> 0.3) + tty-prompt (~> 0.18) + little-plugger (1.1.4) + logging (2.2.2) + little-plugger (~> 1.1) + multi_json (~> 1.10) + memoist (0.16.0) + method_source (0.9.2) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2019.0331) + mixlib-install (3.11.18) + mixlib-shellout + mixlib-versioning + thor + mixlib-log (3.0.1) + mixlib-shellout (2.4.4) + mixlib-versioning (1.2.7) + ms_rest (0.7.4) + concurrent-ruby (~> 1.0) + faraday (~> 0.9) + timeliness (~> 0.3.10) + ms_rest_azure (0.11.1) + concurrent-ruby (~> 1.0) + faraday (~> 0.9) + faraday-cookie_jar (~> 0.0.6) + ms_rest (~> 0.7.4) + unf_ext (= 0.0.7.2) + multi_json (1.13.1) + multipart-post (2.1.1) + necromancer (0.5.0) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-ssh (4.2.0) + net-ssh-gateway (2.0.0) + net-ssh (>= 4.0.0) + nori (2.6.0) + os (1.0.1) + parallel (1.17.0) + parslet (1.8.2) + pastel (0.7.3) + equatable (~> 0.6) + tty-color (~> 0.5) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + public_suffix (3.1.1) + representable (3.0.4) + declarative (< 0.1.0) + declarative-option (< 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.2) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.4) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-its (1.3.0) + rspec-core (>= 3.0.0) + rspec-expectations (>= 3.0.0) + rspec-mocks (3.8.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.2) + rubyntlm (0.6.2) + rubyzip (1.2.3) + semverse (3.0.0) + signet (0.11.0) + addressable (~> 2.3) + faraday (~> 0.9) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + sslshake (1.3.0) + strings (0.1.5) + strings-ansi (~> 0.1) + unicode-display_width (~> 1.5) + unicode_utils (~> 1.4) + strings-ansi (0.1.0) + term-ansicolor (1.7.1) + tins (~> 1.0) + test-kitchen (1.25.0) + license-acceptance (~> 1.0, >= 1.0.11) + mixlib-install (~> 3.6) + mixlib-shellout (>= 1.2, < 3.0) + net-scp (>= 1.1, < 3.0) + net-ssh (>= 2.9, < 5.0) + net-ssh-gateway (>= 1.2, < 3.0) + thor (~> 0.19) + winrm (~> 2.0) + winrm-elevated (~> 1.0) + winrm-fs (~> 1.1) + thor (0.20.3) + timeliness (0.3.10) + tins (1.21.1) + tomlrb (1.2.8) + train (1.7.6) + aws-sdk (~> 2) + azure_graph_rbac (~> 0.16) + azure_mgmt_key_vault (~> 0.17) + azure_mgmt_resources (~> 0.15) + docker-api (~> 1.26) + google-api-client (~> 0.23.9) + googleauth (~> 0.6.6) + inifile + json (>= 1.8, < 3.0) + mixlib-shellout (>= 2.0) + net-scp (~> 1.2) + net-ssh (>= 2.9, < 6.0) + winrm (~> 2.0) + winrm-fs (~> 1.0) + train-habitat (0.2.7) + train (>= 1.7.5, < 3.0) + tty-box (0.4.0) + pastel (~> 0.7.2) + strings (~> 0.1.5) + tty-cursor (~> 0.7) + tty-color (0.5.0) + tty-cursor (0.7.0) + tty-prompt (0.19.0) + necromancer (~> 0.5.0) + pastel (~> 0.7.0) + tty-reader (~> 0.6.0) + tty-reader (0.6.0) + tty-cursor (~> 0.7) + tty-screen (~> 0.7) + wisper (~> 2.0.0) + tty-screen (0.7.0) + tty-table (0.11.0) + equatable (~> 0.6) + necromancer (~> 0.5) + pastel (~> 0.7.2) + strings (~> 0.1.5) + tty-screen (~> 0.7) + tty-which (0.4.1) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.2) + unicode-display_width (1.6.0) + unicode_utils (1.4.0) + winrm (2.3.2) + builder (>= 2.1.2) + erubis (~> 2.7) + gssapi (~> 1.2) + gyoku (~> 1.0) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (~> 2.0) + rubyntlm (~> 0.6.0, >= 0.6.1) + winrm-elevated (1.1.1) + winrm (~> 2.0) + winrm-fs (~> 1.0) + winrm-fs (1.3.2) + erubis (~> 2.7) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 1.1) + winrm (~> 2.0) + wisper (2.0.0) + +PLATFORMS + ruby + +DEPENDENCIES + kitchen-terraform (~> 4.3)! + +RUBY VERSION + ruby 2.5.3p105 + +BUNDLED WITH + 1.17.3 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/Makefile b/Makefile index dbd6d95..c10355f 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,14 @@ SHELL := /usr/bin/env bash +# Docker build config variables +CREDENTIALS_PATH ?= account.json +DOCKER_ORG := leandevopsio +DOCKER_TAG ?= 0.1 +DOCKER_REPO_BASE := ${DOCKER_ORG}/buildenv:${DOCKER_TAG} + # All is the first target in the file so it will get picked up when you just run 'make' on its own -all: check_shell check_python check_golang check_terraform \ - check_docker check_base_files test_check_headers check_headers \ - check_trailing_whitespace generate_docs +all: check_shell check_python check_terraform \ + check_base_files check_trailing_whitespace generate_docs # The .PHONY directive tells make that this isn't a real target and so # the presence of a file named 'check_shell' won't cause this target to stop @@ -16,18 +21,10 @@ check_shell: check_python: @source scripts/make.sh && check_python -.PHONY: check_golang -check_golang: - @source scripts/make.sh && golang - .PHONY: check_terraform check_terraform: @source scripts/make.sh && check_terraform -.PHONY: check_docker -check_docker: - @source scripts/make.sh && docker - .PHONY: check_base_files check_base_files: @source scripts/make.sh && basefiles @@ -36,15 +33,6 @@ check_base_files: check_trailing_whitespace: @source scripts/make.sh && check_trailing_whitespace -.PHONY: test_check_headers -test_check_headers: - @echo "Testing the validity of the header check" - @python scripts/test_verify_boilerplate.py - -.PHONY: check_headers -check_headers: - @source scripts/make.sh && check_headers - # Integration tests .PHONY: test_integration test_integration: @@ -54,3 +42,56 @@ test_integration: generate_docs: @source scripts/make.sh && generate_docs +.PHONY: docker_run +docker_run: + docker run --rm -it \ + -e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \ + -e PROJECT_ID \ + -e RANDOM_STRING_FOR_TESTING \ + -v $(CURDIR):/app \ + ${DOCKER_REPO_BASE} \ + /bin/bash -c "bundle install && .circleci/ci_integration.sh" + +.PHONY: docker_create +docker_create: + docker run --rm -it \ + -e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \ + -e PROJECT_ID \ + -e RANDOM_STRING_FOR_TESTING \ + -v $(CURDIR):/app \ + ${DOCKER_REPO_BASE} \ + /bin/bash -c "source test/ci_integration.sh && setup_environment && kitchen create" + +.PHONY: docker_converge +docker_converge: + docker run --rm -it \ + -e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \ + -e PROJECT_ID \ + -e RANDOM_STRING_FOR_TESTING \ + -v $(CURDIR):/app \ + ${DOCKER_REPO_BASE} \ + /bin/bash -c "source test/ci_integration.sh && setup_environment && kitchen converge" + +.PHONY: docker_verify +docker_verify: + docker run --rm -it \ + -e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \ + -e PROJECT_ID \ + -e RANDOM_STRING_FOR_TESTING \ + -v $(CURDIR):/app \ + ${DOCKER_REPO_BASE} \ + /bin/bash -c "source test/ci_integration.sh && setup_environment && kitchen verify" + +.PHONY: docker_destroy +docker_destroy: + docker run --rm -it \ + -e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \ + -e PROJECT_ID \ + -e RANDOM_STRING_FOR_TESTING \ + -v $(CURDIR):/app \ + ${DOCKER_REPO_BASE} \ + /bin/bash -c "source test/ci_integration.sh && setup_environment && kitchen destroy" + +.PHONY: test_integration_docker +test_integration_docker: docker_create docker_converge docker_verify docker_destroy + @echo "Running test-kitchen tests in docker" diff --git a/README.md b/README.md index 94e4d4e..a84fb11 100644 --- a/README.md +++ b/README.md @@ -7,4 +7,3 @@ It supports creating: - A Google Virtual Private Network (VPC) - Subnets within the VPC - Secondary ranges for the subnets (if applicable) - diff --git a/scripts/make.sh b/scripts/make.sh index ce5cec0..fb92f70 100755 --- a/scripts/make.sh +++ b/scripts/make.sh @@ -6,7 +6,6 @@ finish() { trap finish EXIT # Create a temporary file in the auto-cleaned up directory while avoiding # overwriting TMPDIR for other processes. -# shellcheck disable=SC2120 # (Arguments may be passed, e.g. maketemp -d) maketemp() { TMPDIR="${DELETE_AT_EXIT}" mktemp "$@" }