Skip to content

Commit 1be03b7

Browse files
authored
Merge pull request #63 from ONS-Innovation/KEH-1276
fix(megalint): update configs + version bump
2 parents f1fb6c6 + b852e8a commit 1be03b7

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

.checkov.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ skip-check:
1717
# Pin module sources to a commit hash (false positive)
1818
- CKV_TF_1
1919

20+
# Ignore unrestricted egress to any IP address
21+
# SPP use the same pattern so it's not a concern for us
22+
- CKV_AWS_382
23+
2024
# These ignores are TEMPORARY. They will be resolved in the future.
2125
- CKV_AWS_108
2226
- CKV_AWS_272

.github/workflows/megalinter.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ jobs:
8585

8686
# You can override MegaLinter flavor used to have faster performances
8787
# More info at https://megalinter.io/latest/flavors/
88-
uses: oxsecurity/megalinter@1fc052d03c7a43c78fe0fee19c9d648b749e0c01
88+
# The below commit hash is v8.8.0
89+
uses: oxsecurity/megalinter@e08c2b05e3dbc40af4c23f41172ef1e068a7d651
8990

9091
id: ml
9192

.mega-linter.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ DISABLE_LINTERS:
2828
- REPOSITORY_TRUFFLEHOG
2929
- REPOSITORY_GIT_DIFF
3030

31-
# Conflicting with Prettier
32-
- MARKDOWN_MARKDOWN_TABLE_FORMATTER
33-
3431
# Disabled due to false positives
3532
- MARKDOWN_MARKDOWN_LINK_CHECK
3633

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ megalint: ## Run the mega-linter.
6262
docker run --platform linux/amd64 --rm \
6363
-v /var/run/docker.sock:/var/run/docker.sock:rw \
6464
-v $(shell pwd):/tmp/lint:rw \
65-
oxsecurity/megalinter:v7
65+
oxsecurity/megalinter:v8
6666

6767
.PHONY: mypy
6868
mypy: ## Run mypy.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ Further information can be found in [this project's documentation](/docs/index.m
193193
**Example Output:**
194194

195195
| REPOSITORY | TAG | IMAGE ID | CREATED | SIZE |
196-
| --------------------------- | ------ | ------------ | -------------- | ----- |
196+
|-----------------------------|--------|--------------|----------------|-------|
197197
| copilot-usage-lambda-script | latest | 0bbe73d9256f | 11 seconds ago | 224MB |
198198

199199
3. Run the image locally mapping local host port (9000) to container port (8080) and passing in AWS credentials to download a .pem file from the AWS Secrets Manager to the running container. These credentials will also be used to upload and download `historic_usage_data.json` to and from S3.
@@ -233,7 +233,7 @@ Further information can be found in [this project's documentation](/docs/index.m
233233
**Example output:**
234234

235235
| CONTAINER ID | IMAGE | COMMAND | CREATED | STATUS | PORTS | NAMES |
236-
| ------------ | --------------------------- | ---------------------- | -------------- | ------------- | ----------------------------------------- | ------------ |
236+
|--------------|-----------------------------|------------------------|----------------|---------------|-------------------------------------------|--------------|
237237
| 3f7d64676b1a | copilot-usage-lambda-script | "/lambda-entrypoint.…" | 44 seconds ago | Up 44 seconds | 0.0.0.0:9000->8080/tcp, :::9000->8080/tcp | nice_ritchie |
238238

239239
Stop the container

0 commit comments

Comments
 (0)