Skip to content

Commit e649c39

Browse files
committed
odin-266: split metrics lambda from internal repo
1 parent aea40a0 commit e649c39

File tree

93 files changed

+4318
-2859
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+4318
-2859
lines changed

.gitallowed

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
.gitdisallowed:[0-9]+:.*
33
.git/(?!COMMIT_EDITMSG|OTHERFILE)\w+:.*
44
terraform/modules/account/s3.tf:[0-9]+:\s+"arn:aws:iam::652711504416:root"
5+
.github/workflows/.*:[0-9]+:#?\s+sonar-token: \$\{\{ secrets.SONAR_TOKEN \}\}
6+
src/clients.py:[0-9]+:\s+token=creds.get\("SessionToken"\)

.github/workflows/merge-develop.yml

Lines changed: 52 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,57 @@ on:
44
branches:
55
- develop
66

7-
env:
8-
ACCOUNT_ID: ${{ secrets.DEV_ACCOUNT_ID }}
9-
107
jobs:
118

12-
on-merge:
13-
uses: NHSDigital/odin-actions/.github/workflows/on-merge-pipeline.yml@v1
14-
with:
15-
repo-name: odin-template
16-
terraform-approvals: false
17-
18-
create-release:
19-
needs:
20-
- on-merge
21-
# - tests
22-
uses: NHSDigital/odin-actions/.github/workflows/on-merge-create-release.yml@v1
23-
with:
24-
repo-name: odin-template
25-
application: "replace-me"
26-
# stack: "main"
27-
on-merge-execution-id: "${{ needs.on-merge.outputs.on-merge-execution-id }}"
9+
10+
scan:
11+
uses: NHSDigital/odin-actions/.github/workflows/sonar-scan.yml@v1
12+
secrets:
13+
sonar-token: ${{ secrets.SONAR_TOKEN }}
14+
15+
16+
tag-version:
17+
runs-on: ubuntu-latest
18+
19+
timeout-minutes: 30
20+
steps:
21+
- name: checkout the calling repo
22+
uses: actions/checkout@v4
23+
with:
24+
fetch-depth: 0
25+
26+
- name: check for specific poetry version
27+
id: poetry-version
28+
shell: bash
29+
run: |
30+
version="latest"
31+
if [ -f .tool-versions ] && grep -Eq "^poetry .*" .tool-versions; then
32+
version="$(grep -E "^poetry .*" .tool-versions | cut -d ' ' -f2)"
33+
fi
34+
echo "version=${version}" >> "$GITHUB_OUTPUT"
35+
36+
- name: install poetry
37+
uses: snok/install-poetry@v1
38+
with:
39+
version: ${{ steps.poetry-version.outputs.version }}
40+
plugins: poetry-dynamic-versioning
41+
42+
- name: increment patch version and replace major version
43+
shell: bash
44+
id: get-version
45+
run: |
46+
# Create semantic version tag: vN.N.N
47+
SEMANTIC_VERSION="v$(poetry version patch -s)"
48+
git tag "${SEMANTIC_VERSION}"
49+
git push origin "${SEMANTIC_VERSION}"
50+
51+
# Delete existing major version tag if it already exists: vN
52+
MAJOR_VERSION="$(echo ${SEMANTIC_VERSION} | cut -d. -f1)"
53+
if [[ $(git tag --list ${MAJOR_VERSION}) != "" ]]; then
54+
git tag -d ${MAJOR_VERSION}
55+
git push origin :refs/tags/${MAJOR_VERSION}
56+
fi
57+
58+
# Create major version tag
59+
git tag "${MAJOR_VERSION}"
60+
git push origin "${MAJOR_VERSION}"

.github/workflows/pull-request.yml

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,48 @@ on:
55
branches:
66
- develop
77

8-
env:
9-
ACCOUNT_ID: "${{ secrets.DEV_ACCOUNT_ID }}"
10-
118
jobs:
129

1310
lint:
1411
uses: NHSDigital/odin-actions/.github/workflows/standard-linting.yml@v1
1512

16-
validate-build:
17-
18-
runs-on:
19-
- codebuild-runner-odin-template-${{ github.run_id }}-${{ github.run_attempt }}
20-
- buildspec-override:true
21-
steps:
22-
23-
- name: checkout the calling repo
24-
uses: actions/checkout@v4
25-
with:
26-
fetch-depth: 0
27-
28-
- name: common build setup
29-
uses: NHSDigital/odin-actions/.github/actions/build-common@v1
30-
31-
- name: build artifacts
32-
id: build-artifacts
33-
uses: NHSDigital/odin-actions/.github/actions/build-artifacts@v1
34-
with:
35-
application: "replace-me"
36-
37-
# - name: terraform-plan
38-
# uses: NHSDigital/odin-actions/.github/actions/terraform-stack-plan-no-lock-codepipeline@v1
13+
test:
14+
uses: NHSDigital/odin-actions/.github/workflows/test-and-sonar-scan.yml@v1
15+
secrets:
16+
sonar-token: ${{ secrets.SONAR_TOKEN }}
17+
18+
# validate-build:
19+
#
20+
# runs-on:
21+
# - codebuild-runner-terraform-aws-metrics-lambda-${{ github.run_id }}-${{ github.run_attempt }}
22+
# - buildspec-override:true
23+
# steps:
24+
#
25+
# - name: checkout the calling repo
26+
# uses: actions/checkout@v4
27+
# with:
28+
# fetch-depth: 0
29+
#
30+
# - name: common build setup
31+
# uses: NHSDigital/odin-actions/.github/actions/build-common@v1
32+
#
33+
# - name: build artifacts
34+
# id: build-artifacts
35+
# uses: NHSDigital/odin-actions/.github/actions/build-artifacts@v1
3936
# with:
40-
# application: "replace-me"
41-
# version: ${{ steps.build-artifacts.outputs.version }}
37+
# application: "metriczzz"
38+
#
39+
## - name: terraform-plan
40+
## uses: NHSDigital/odin-actions/.github/actions/terraform-stack-plan-no-lock-codepipeline@v1
41+
## with:
42+
## application: "metriczzz"
43+
## version: ${{ steps.build-artifacts.outputs.version }}
4244

4345
auto-merge-dependabot:
4446
needs:
4547
- lint
46-
- validate-build
48+
- test
49+
# - validate-build
4750
if: github.event.pull_request.user.login == 'dependabot[bot]'
4851
uses: NHSDigital/odin-actions/.github/workflows/dependabot-automation.yml@v1
4952
with:

.tflint.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
plugin "aws" {
33
enabled = true
4-
version = "0.37.0"
4+
version = "0.42.0"
55
source = "github.com/terraform-linters/tflint-ruleset-aws"
66
}
77

.tool-versions

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
pre-commit 4.2.0
2-
python 3.11.11
2+
python 3.12.10
33
poetry 1.8.5
44
terraform 1.12.2
55
trivy 0.63.0
66
tflint 0.58.0
7-
kubectl 1.33.2
8-
helm 3.18.3

APACHE-LICENCE.md

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2024 The Prometheus Authors
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ tools used:
1111
### install project tools
1212
use asdf to ensure required tools are installed ... configured tools are in [.tool-versions](.tool-versions)
1313
```bash
14-
cd ~/work/odin-<replace-me>
14+
cd ~/work/terraform-aws-metrics-lambda
1515
for plugin in $(grep -E '^\w+' .tool-versions | cut -d' ' -f1); do asdf plugin add $plugin; done
1616
asdf install
1717
```

0 commit comments

Comments
 (0)