From 714e352f2cee2c5a7cb238647facce86a91c10bc Mon Sep 17 00:00:00 2001 From: Thomas H Jones II Date: Mon, 13 Nov 2023 12:14:10 -0500 Subject: [PATCH 1/5] Add contents from repo-template project Closes #6 --- .bumpversion.cfg | 6 ++++++ .editorconfig | 36 +++++++++++++++++++++++++++++++++++ .gitattributes | 2 ++ .github/dependabot.yml | 20 +++++++++++++++++++ .github/workflows/lint.yml | 11 +++++++++++ .github/workflows/release.yml | 19 ++++++++++++++++++ .github/workflows/test.yml | 11 +++++++++++ .gitignore | 22 +++++++++++++++++++++ .gitkeep | 0 .mergify.yml | 15 +++++++++++++++ CHANGELOG.md | 33 ++++++++++++++++++++++++++++++++ CHANGELOG.template.md | 13 +++++++++++++ Dockerfile | 1 + Makefile | 1 + dependabot.yml | 20 +++++++++++++++++++ lint.yml | 11 +++++++++++ release.yml | 19 ++++++++++++++++++ test.yml | 11 +++++++++++ 18 files changed, 251 insertions(+) create mode 100644 .bumpversion.cfg create mode 100644 .editorconfig create mode 100644 .gitattributes create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/lint.yml create mode 100644 .github/workflows/release.yml create mode 100644 .github/workflows/test.yml create mode 100644 .gitignore create mode 100644 .gitkeep create mode 100644 .mergify.yml create mode 100644 CHANGELOG.md create mode 100644 CHANGELOG.template.md create mode 100644 Dockerfile create mode 100644 Makefile create mode 100644 dependabot.yml create mode 100644 lint.yml create mode 100644 release.yml create mode 100644 test.yml diff --git a/.bumpversion.cfg b/.bumpversion.cfg new file mode 100644 index 0000000..a5731e4 --- /dev/null +++ b/.bumpversion.cfg @@ -0,0 +1,6 @@ +[bumpversion] +current_version = 1.2.0 +commit = True +message = Bumps version to {new_version} +tag = False +tag_name = {new_version} diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..2e514aa --- /dev/null +++ b/.editorconfig @@ -0,0 +1,36 @@ +# see http://editorconfig.org +root = true + +[*] +end_of_line = lf +trim_trailing_whitespace = true +insert_final_newline = true +indent_style = space +indent_size = 2 +charset = utf-8 +tab_width = 4 + +[*.md] +trim_trailing_whitespace = false + +[*.py] +indent_size = 4 + +[go.mod] +indent_style = tab +indent_size = 1 + +[*.go] +indent_style = tab +indent_size = 1 + +[Makefile] +indent_style = tab +indent_size = 1 + +[Makefile.*] +indent_style = tab +indent_size = 1 + +[LICENSE] +indent_size = none diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..e7c1d93 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text eol=lf diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..653a660 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,20 @@ +version: 2 +updates: + # Maintain dependencies for GitHub Actions + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly + groups: + github-actions: + patterns: + - "*" + # Maintain dependencies for dockerfiles + - package-ecosystem: docker + directory: / + schedule: + interval: weekly + groups: + docker: + patterns: + - "*" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..ad668aa --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,11 @@ +name: Run lint and static analyis checks +on: + pull_request: + +concurrency: + group: lint-${{ github.head_ref || github.ref }} + cancel-in-progress: true + +jobs: + lint: + uses: plus3it/actions-workflows/.github/workflows/lint.yml@c9c3d1193bd64bc2a9def11605608a98a3164d96 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..bda9e68 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,19 @@ +name: Create GitHub Release + +on: + # Run on demand + workflow_dispatch: + + # Run on push to main when .bumpversion.cfg version is updated + push: + branches: + - main + - master + paths: + - .bumpversion.cfg + +jobs: + release: + uses: plus3it/actions-workflows/.github/workflows/release.yml@c9c3d1193bd64bc2a9def11605608a98a3164d96 + secrets: + release-token: ${{ secrets.GH_RELEASES_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..594bf55 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,11 @@ +name: Run test jobs +on: + pull_request: + +concurrency: + group: test-${{ github.head_ref || github.ref }} + cancel-in-progress: true + +jobs: + test: + uses: plus3it/actions-workflows/.github/workflows/test.yml@c9c3d1193bd64bc2a9def11605608a98a3164d96 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ee9bd96 --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +# Local .terraform directories +.terraform/ +.terraform.lock.hcl + +# .tfstate files +*.tfstate +*.tfstate.* + +# .tfvars files +*.tfvars + +# tardigrade-ci +.tardigrade-ci +tardigrade-ci/ + +# python cache +__pycache__ +.python-version +.pytest_cache + +#macOS local dir meta file +.DS_Store diff --git a/.gitkeep b/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000..0c77e19 --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,15 @@ +pull_request_rules: + - name: approve dependabot pull requests + conditions: + - author=dependabot[bot] + actions: + review: + type: APPROVE + + - name: merge dependabot pull requests + conditions: + - author=dependabot[bot] + - "#approved-reviews-by>=1" + actions: + merge: + method: merge diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..222e408 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,33 @@ +## repo-template + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). + +### [1.2.0] (https://github.com/plus3it/repo-template/releases/tag/1.2.0) + +**Summary**: + +* Updated SHA value for Github Actions Workflows +* Updated CHANGELOG.template.md file +* Added Master branch in release workflow logic to make migration to Github Actions more efficient + +### 1.1.0 + +**Commit Delta**: N/A + +**Released**: 2023.01.27 + +**Summary**: + +* Updated workflow files to be consumable and reusable, and now points to actions-workflows repo + +### 1.0.0 + +**Commit Delta**: N/A + +**Released**: 2023.01.10 + +**Summary**: + +* Initial release of capability diff --git a/CHANGELOG.template.md b/CHANGELOG.template.md new file mode 100644 index 0000000..c61f573 --- /dev/null +++ b/CHANGELOG.template.md @@ -0,0 +1,13 @@ +## {{ repo-name }} + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). + +### [{{Major.Minor.Patch}}](https://github.com/plus3it/{{RepoName}}/releases/tag/{{Major.Minor.Patch}}) + +**Released**: {{ YYYY.MM.DD }} + +**Summary**: + +* {{ Bulleted descriptions of enhancements, changes, or fixes }} diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..b44642d --- /dev/null +++ b/Dockerfile @@ -0,0 +1 @@ +FROM plus3it/tardigrade-ci:0.24.14 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..634033f --- /dev/null +++ b/Makefile @@ -0,0 +1 @@ +include $(shell test -f .tardigrade-ci || curl -sSL -o .tardigrade-ci "https://raw.githubusercontent.com/plus3it/tardigrade-ci/master/bootstrap/Makefile.bootstrap"; echo .tardigrade-ci) diff --git a/dependabot.yml b/dependabot.yml new file mode 100644 index 0000000..653a660 --- /dev/null +++ b/dependabot.yml @@ -0,0 +1,20 @@ +version: 2 +updates: + # Maintain dependencies for GitHub Actions + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly + groups: + github-actions: + patterns: + - "*" + # Maintain dependencies for dockerfiles + - package-ecosystem: docker + directory: / + schedule: + interval: weekly + groups: + docker: + patterns: + - "*" diff --git a/lint.yml b/lint.yml new file mode 100644 index 0000000..ad668aa --- /dev/null +++ b/lint.yml @@ -0,0 +1,11 @@ +name: Run lint and static analyis checks +on: + pull_request: + +concurrency: + group: lint-${{ github.head_ref || github.ref }} + cancel-in-progress: true + +jobs: + lint: + uses: plus3it/actions-workflows/.github/workflows/lint.yml@c9c3d1193bd64bc2a9def11605608a98a3164d96 diff --git a/release.yml b/release.yml new file mode 100644 index 0000000..bda9e68 --- /dev/null +++ b/release.yml @@ -0,0 +1,19 @@ +name: Create GitHub Release + +on: + # Run on demand + workflow_dispatch: + + # Run on push to main when .bumpversion.cfg version is updated + push: + branches: + - main + - master + paths: + - .bumpversion.cfg + +jobs: + release: + uses: plus3it/actions-workflows/.github/workflows/release.yml@c9c3d1193bd64bc2a9def11605608a98a3164d96 + secrets: + release-token: ${{ secrets.GH_RELEASES_TOKEN }} diff --git a/test.yml b/test.yml new file mode 100644 index 0000000..594bf55 --- /dev/null +++ b/test.yml @@ -0,0 +1,11 @@ +name: Run test jobs +on: + pull_request: + +concurrency: + group: test-${{ github.head_ref || github.ref }} + cancel-in-progress: true + +jobs: + test: + uses: plus3it/actions-workflows/.github/workflows/test.yml@c9c3d1193bd64bc2a9def11605608a98a3164d96 From 55bc70ce24f6a873406b2ca24acf69cb0fda0ad9 Mon Sep 17 00:00:00 2001 From: Thomas H Jones II Date: Mon, 13 Nov 2023 12:17:31 -0500 Subject: [PATCH 2/5] Fix copyright-holder's line --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 261eeb9..b3e8c89 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright 2023 Maintainers of plus3it/AMIgen9 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 7787e87b7655ec2dcde6633b6cd8cf5c0e4e5f0a Mon Sep 17 00:00:00 2001 From: Thomas H Jones II Date: Tue, 14 Nov 2023 09:14:27 -0500 Subject: [PATCH 3/5] Per PR convo: not relevant to this project --- .bumpversion.cfg | 6 ------ .github/workflows/release.yml | 19 ------------------- .github/workflows/test.yml | 11 ----------- .gitkeep | 0 CHANGELOG.md | 33 --------------------------------- CHANGELOG.template.md | 13 ------------- lint.yml | 11 ----------- 7 files changed, 93 deletions(-) delete mode 100644 .bumpversion.cfg delete mode 100644 .github/workflows/release.yml delete mode 100644 .github/workflows/test.yml delete mode 100644 .gitkeep delete mode 100644 CHANGELOG.md delete mode 100644 CHANGELOG.template.md delete mode 100644 lint.yml diff --git a/.bumpversion.cfg b/.bumpversion.cfg deleted file mode 100644 index a5731e4..0000000 --- a/.bumpversion.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[bumpversion] -current_version = 1.2.0 -commit = True -message = Bumps version to {new_version} -tag = False -tag_name = {new_version} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index bda9e68..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Create GitHub Release - -on: - # Run on demand - workflow_dispatch: - - # Run on push to main when .bumpversion.cfg version is updated - push: - branches: - - main - - master - paths: - - .bumpversion.cfg - -jobs: - release: - uses: plus3it/actions-workflows/.github/workflows/release.yml@c9c3d1193bd64bc2a9def11605608a98a3164d96 - secrets: - release-token: ${{ secrets.GH_RELEASES_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 594bf55..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Run test jobs -on: - pull_request: - -concurrency: - group: test-${{ github.head_ref || github.ref }} - cancel-in-progress: true - -jobs: - test: - uses: plus3it/actions-workflows/.github/workflows/test.yml@c9c3d1193bd64bc2a9def11605608a98a3164d96 diff --git a/.gitkeep b/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 222e408..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,33 +0,0 @@ -## repo-template - -All notable changes to this project will be documented in this file. - -The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). - -### [1.2.0] (https://github.com/plus3it/repo-template/releases/tag/1.2.0) - -**Summary**: - -* Updated SHA value for Github Actions Workflows -* Updated CHANGELOG.template.md file -* Added Master branch in release workflow logic to make migration to Github Actions more efficient - -### 1.1.0 - -**Commit Delta**: N/A - -**Released**: 2023.01.27 - -**Summary**: - -* Updated workflow files to be consumable and reusable, and now points to actions-workflows repo - -### 1.0.0 - -**Commit Delta**: N/A - -**Released**: 2023.01.10 - -**Summary**: - -* Initial release of capability diff --git a/CHANGELOG.template.md b/CHANGELOG.template.md deleted file mode 100644 index c61f573..0000000 --- a/CHANGELOG.template.md +++ /dev/null @@ -1,13 +0,0 @@ -## {{ repo-name }} - -All notable changes to this project will be documented in this file. - -The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). - -### [{{Major.Minor.Patch}}](https://github.com/plus3it/{{RepoName}}/releases/tag/{{Major.Minor.Patch}}) - -**Released**: {{ YYYY.MM.DD }} - -**Summary**: - -* {{ Bulleted descriptions of enhancements, changes, or fixes }} diff --git a/lint.yml b/lint.yml deleted file mode 100644 index ad668aa..0000000 --- a/lint.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Run lint and static analyis checks -on: - pull_request: - -concurrency: - group: lint-${{ github.head_ref || github.ref }} - cancel-in-progress: true - -jobs: - lint: - uses: plus3it/actions-workflows/.github/workflows/lint.yml@c9c3d1193bd64bc2a9def11605608a98a3164d96 From 9d18adcda175bae4ebf8fcdbdef95c950fa2adda Mon Sep 17 00:00:00 2001 From: Thomas H Jones II Date: Tue, 14 Nov 2023 09:18:45 -0500 Subject: [PATCH 4/5] Move out of project-root --- release.yml => .github/workflows/release.yml | 0 test.yml => .github/workflows/test.yml | 0 dependabot.yml | 20 -------------------- 3 files changed, 20 deletions(-) rename release.yml => .github/workflows/release.yml (100%) rename test.yml => .github/workflows/test.yml (100%) delete mode 100644 dependabot.yml diff --git a/release.yml b/.github/workflows/release.yml similarity index 100% rename from release.yml rename to .github/workflows/release.yml diff --git a/test.yml b/.github/workflows/test.yml similarity index 100% rename from test.yml rename to .github/workflows/test.yml diff --git a/dependabot.yml b/dependabot.yml deleted file mode 100644 index 653a660..0000000 --- a/dependabot.yml +++ /dev/null @@ -1,20 +0,0 @@ -version: 2 -updates: - # Maintain dependencies for GitHub Actions - - package-ecosystem: github-actions - directory: / - schedule: - interval: weekly - groups: - github-actions: - patterns: - - "*" - # Maintain dependencies for dockerfiles - - package-ecosystem: docker - directory: / - schedule: - interval: weekly - groups: - docker: - patterns: - - "*" From b336ac0d9d7b9e0fb8f0f7463e0d729f5cfd20e6 Mon Sep 17 00:00:00 2001 From: Thomas H Jones II Date: Tue, 14 Nov 2023 09:36:48 -0500 Subject: [PATCH 5/5] Not relevant to this project --- .github/workflows/release.yml | 19 ------------------- .github/workflows/test.yml | 11 ----------- 2 files changed, 30 deletions(-) delete mode 100644 .github/workflows/release.yml delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index bda9e68..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Create GitHub Release - -on: - # Run on demand - workflow_dispatch: - - # Run on push to main when .bumpversion.cfg version is updated - push: - branches: - - main - - master - paths: - - .bumpversion.cfg - -jobs: - release: - uses: plus3it/actions-workflows/.github/workflows/release.yml@c9c3d1193bd64bc2a9def11605608a98a3164d96 - secrets: - release-token: ${{ secrets.GH_RELEASES_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 594bf55..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Run test jobs -on: - pull_request: - -concurrency: - group: test-${{ github.head_ref || github.ref }} - cancel-in-progress: true - -jobs: - test: - uses: plus3it/actions-workflows/.github/workflows/test.yml@c9c3d1193bd64bc2a9def11605608a98a3164d96