Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Scan GitLab EC2 instance with Amazon Inspector (#4189, #4751) #5058

Merged
merged 4 commits into from
Mar 17, 2023
Merged

Scan GitLab EC2 instance with Amazon Inspector (#4189, #4751) #5058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05468d5
Remove redundant bucket ACL
hannes-ucsc Mar 16, 2023
1c6a4e8
Remove unused Makefile target
hannes-ucsc Mar 16, 2023
58407f1
Fix: `make -C terraform init` dirties provider lock file (#4751)
hannes-ucsc Mar 16, 2023
59c2a7d
[u] Scan GitLab EC2 instance with Amazon Inspector (#4189)
hannes-ucsc Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions UPGRADING.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@ reverted. This is all fairly informal and loosely defined. Hopefully we won't
have too many entries in this file.


#4189 Scan GitLab EC2 instance with Amazon Inspector
====================================================

Operator
~~~~~~~~

Manually deploy the ``gitlab`` component of any main deployment just *before*
pushing the merge commit to the GitLab instance in that deployment.


#5019 Index public & mock-MA snapshots in anvilprod
===================================================

Expand Down
40 changes: 24 additions & 16 deletions terraform/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 17 additions & 4 deletions terraform/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@ clean: check_env git_clean
.PHONY: state
state: check_terraform check_branch check_aws

.PHONY: initable
initable: clean state providers.tf.json backend.tf.json

.PHONY: init
init: clean state providers.tf.json backend.tf.json
init: initable
terraform init -reconfigure
$(MAKE) check_providers_clean

.PHONY: check_schema
check_schema: init
Expand Down Expand Up @@ -68,6 +72,15 @@ auto_destroy: validate import_resources
@echo '!!! All resources will be deleted in 10s, hit Ctrl-C to cancel !!!'; sleep 10
terraform destroy -auto-approve

.PHONY: taint_dependencies_layer
taint_dependencies_layer: config
terraform taint -allow-missing aws_lambda_layer_version.dependencies
.PHONY: provider_update
provider_update: initable
terraform init -upgrade
terraform providers lock -platform=linux_amd64 \
-platform=linux_arm64 \
-platform=darwin_amd64 \
-platform=darwin_arm64

.PHONY: check_providers_clean
check_providers_clean:
git diff --exit-code --name-only .terraform.lock.hcl \
&& git diff --cached --exit-code --name-only .terraform.lock.hcl
Loading