Skip to content

Commit

Permalink
chore: remove dev7 (#7229)
Browse files Browse the repository at this point in the history
  • Loading branch information
alismx committed Jan 30, 2024
1 parent 736a99a commit b551b21
Show file tree
Hide file tree
Showing 30 changed files with 11 additions and 932 deletions.
1 change: 0 additions & 1 deletion .github/workflows/deployDev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ on:
- dev4
- dev5
- dev6
- dev7
- pentest

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/liquibaseClearChecksums.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
description: The environment of the database.
required: true
type: choice
options: [demo, dev, dev2, dev3, dev4, dev5, dev6, dev7, pentest, test, training, stg, prod]
options: [demo, dev, dev2, dev3, dev4, dev5, dev6, pentest, test, training, stg, prod]
default: dev
action:
description: The liquibase action to run.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/liquibaseRollback.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
description: The environment of the database.
required: true
type: choice
options: [demo, dev, dev2, dev3, dev4, dev5, dev6, dev7, pentest, test, training, stg, prod]
options: [demo, dev, dev2, dev3, dev4, dev5, dev6, pentest, test, training, stg, prod]
default: dev
action:
description: The liquibase action to run.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/liquibaseValidate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
description: The environment of the database.
required: true
type: choice
options: [demo, dev, dev2, dev3, dev4, dev5, dev6, dev7, pentest, test, training, stg, prod]
options: [demo, dev, dev2, dev3, dev4, dev5, dev6, pentest, test, training, stg, prod]
default: dev
action:
description: The liquibase action to run.
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/slotSwapDevAPI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ on:
- dev4
- dev5
- dev6
- dev7
- pentest

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/terraformChecks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
env:
TERRAFORM_DIRS: |
dev dev/persistent dev2 dev2/persistent dev3 dev3/persistent dev4 dev4/persistent
dev5 dev5/persistent dev6 dev6/persistent dev7 dev7/persistent
dev5 dev5/persistent dev6 dev6/persistent
test test/persistent demo demo/persistent training training/persistent
stg stg/persistent pentest pentest/persistent prod prod/persistent
global
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/terraformPlan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ on:
- dev4
- dev5
- dev6
- dev7
- pentest
- test
- demo
Expand All @@ -41,7 +40,7 @@ jobs:
- id: set_matrix
run: |
if [[ "${{ inputs.env }}" == "all_environments" ]]; then
matrix=[{\"env\":\"dev\"},{\"env\":\"dev2\"},{\"env\":\"dev3\"},{\"env\":\"dev4\"},{\"env\":\"dev5\"},{\"env\":\"dev6\"},{\"env\":\"dev7\"},{\"env\":\"pentest\"},{\"env\":\"test\"},{\"env\":\"demo\"},{\"env\":\"training\"},{\"env\":\"stg\"},{\"env\":\"prod\"}]
matrix=[{\"env\":\"dev\"},{\"env\":\"dev2\"},{\"env\":\"dev3\"},{\"env\":\"dev4\"},{\"env\":\"dev5\"},{\"env\":\"dev6\"},{\"env\":\"pentest\"},{\"env\":\"test\"},{\"env\":\"demo\"},{\"env\":\"training\"},{\"env\":\"stg\"},{\"env\":\"prod\"}]
else
matrix=[{\"env\":\"${{ inputs.env }}\"}]
fi
Expand Down
17 changes: 0 additions & 17 deletions backend/src/main/resources/application-azure-dev7.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions backend/src/main/resources/application-okta-dev7.yaml

This file was deleted.

1 change: 0 additions & 1 deletion backend/src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ spring:
azure-dev4: okta-dev4, server-debug
azure-dev5: okta-dev5, server-debug
azure-dev6: okta-dev6, server-debug
azure-dev7: okta-dev7, server-debug
azure-pentest: okta-pentest
azure-training: no-security, no-okta-mgmt, create-sample-data, no-okta-auth
azure-test: okta-test, server-debug
Expand Down
4 changes: 2 additions & 2 deletions ops/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ default:

# Internal target: check if the passed-in wildcard is a known environment name. Hard-coding them because let's be real here.
.valid-env-%:
@case $* in test|dev|dev2|dev3|dev4|dev5|dev6|dev7|demo|training|pentest|stg|prod) ;; *) echo "$* is not a valid environment"; exit 1;; esac
@case $* in test|dev|dev2|dev3|dev4|dev5|dev6|demo|training|pentest|stg|prod) ;; *) echo "$* is not a valid environment"; exit 1;; esac

api.tfvars: /dev/null
echo "acr_image_tag=\"$(DEPLOYED_COMMIT)\"" > $@; \
Expand Down Expand Up @@ -68,7 +68,7 @@ deploy-%: .valid-env-% api.tfvars
terraform -chdir=$* apply -auto-approve -var-file=../api.tfvars -lock-timeout=30m

promote-%: .be-logged-in .valid-env-%
@case $* in dev2|dev3|dev4|dev5|dev6|dev7) az webapp deployment slot swap -g prime-simple-report-dev -n $(API_NAME) --slot $(SOURCE_SLOT) --target-slot $(TARGET_SLOT) ;; *) az webapp deployment slot swap -g prime-simple-report-$* -n $(API_NAME) --slot $(SOURCE_SLOT) --target-slot $(TARGET_SLOT) ;; esac
@case $* in dev2|dev3|dev4|dev5|dev6) az webapp deployment slot swap -g prime-simple-report-dev -n $(API_NAME) --slot $(SOURCE_SLOT) --target-slot $(TARGET_SLOT) ;; *) az webapp deployment slot swap -g prime-simple-report-$* -n $(API_NAME) --slot $(SOURCE_SLOT) --target-slot $(TARGET_SLOT) ;; esac

wait-for-%-slot-commit: .valid-env-%
@echo "Starting wait for commit $(DEPLOYED_COMMIT) in $(SOURCE_SLOT) slot of $* at `date`"
Expand Down
22 changes: 0 additions & 22 deletions ops/dev7/.terraform.lock.hcl

This file was deleted.

20 changes: 0 additions & 20 deletions ops/dev7/_config.tf

This file was deleted.

Loading

0 comments on commit b551b21

Please sign in to comment.