Skip to content

Commit

Permalink
Revert "add post prod deploy smoke test and alert (#7057)" (#7119)
Browse files Browse the repository at this point in the history
This reverts commit 00a691b.

Co-authored-by: elisa lee <[email protected]>
  • Loading branch information
fzhao99 and emyl3 authored Dec 21, 2023
1 parent 00a691b commit 3df3157
Show file tree
Hide file tree
Showing 17 changed files with 3 additions and 332 deletions.
19 changes: 0 additions & 19 deletions .github/actions/post-deploy-smoke-test/action.yml

This file was deleted.

2 changes: 0 additions & 2 deletions .github/workflows/deployProd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,3 @@ jobs:
:siren-gif: Deploy to ${{ env.DEPLOY_ENV }} failed. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} :siren-gif:
webhook_url: ${{ secrets.SR_ALERTS_SLACK_WEBHOOK_URL }}
user_map: $${{ secrets.SR_ALERTS_GITHUB_SLACK_MAP }}

# a post-prod health check workflow is defined in smokeTestDeployProd. See the Alert response wiki page for more details
48 changes: 0 additions & 48 deletions .github/workflows/smokeTestDeployProd.yml

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package gov.cdc.usds.simplereport.config;

import com.okta.spring.boot.oauth.Okta;
import gov.cdc.usds.simplereport.api.heathcheck.BackendAndDatabaseHealthIndicator;
import gov.cdc.usds.simplereport.service.model.IdentityAttributes;
import gov.cdc.usds.simplereport.service.model.IdentitySupplier;
import lombok.extern.slf4j.Slf4j;
Expand Down Expand Up @@ -58,8 +57,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
.permitAll()
.requestMatchers(EndpointRequest.to(InfoEndpoint.class))
.permitAll()
.requestMatchers(EndpointRequest.to(BackendAndDatabaseHealthIndicator.class))
.permitAll()
// Patient experience authorization is handled in PatientExperienceController
// If this configuration changes, please update the documentation on both sides
.requestMatchers(HttpMethod.POST, WebConfiguration.PATIENT_EXPERIENCE)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package gov.cdc.usds.simplereport.idp.repository;

import static gov.cdc.usds.simplereport.api.heathcheck.BackendAndDatabaseHealthIndicator.ACTIVE_LITERAL;

import com.okta.sdk.resource.model.UserStatus;
import gov.cdc.usds.simplereport.api.CurrentTenantDataAccessContextHolder;
import gov.cdc.usds.simplereport.api.model.errors.ConflictingUserException;
Expand Down Expand Up @@ -433,9 +431,4 @@ public Integer getUsersInSingleFacility(Facility facility) {

return accessCount;
}

@Override
public String getApplicationStatusForHealthCheck() {
return ACTIVE_LITERAL;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -692,11 +692,6 @@ public PartialOktaUser findUser(String username) {
.build();
}

@Override
public String getApplicationStatusForHealthCheck() {
return app.getStatus().toString();
}

private Optional<OrganizationRoleClaims> getOrganizationRoleClaimsFromAuthorities(
Collection<String> authorities) {
List<OrganizationRoleClaims> claims = extractor.convertClaims(authorities);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,4 @@ List<String> updateUserPrivilegesAndGroupAccess(
Integer getUsersInSingleFacility(Facility facility);

PartialOktaUser findUser(String username);

String getApplicationStatusForHealthCheck();
}
1 change: 0 additions & 1 deletion backend/src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ management:
endpoint.health.probes.enabled: true
endpoint.info.enabled: true
endpoints.web.exposure.include: health, info
endpoint.health.show-components: always
okta:
oauth2:
issuer: https://hhs-prime.okta.com/oauth2/default
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import gov.cdc.usds.simplereport.api.CurrentOrganizationRolesContextHolder;
import gov.cdc.usds.simplereport.api.CurrentTenantDataAccessContextHolder;
import gov.cdc.usds.simplereport.api.WebhookContextHolder;
import gov.cdc.usds.simplereport.api.heathcheck.BackendAndDatabaseHealthIndicator;
import gov.cdc.usds.simplereport.api.pxp.CurrentPatientContextHolder;
import gov.cdc.usds.simplereport.config.AuditingConfig;
import gov.cdc.usds.simplereport.config.AuthorizationProperties;
Expand Down Expand Up @@ -101,8 +100,7 @@
CurrentTenantDataAccessContextHolder.class,
WebhookContextHolder.class,
TenantDataAccessService.class,
PatientSelfRegistrationLinkService.class,
BackendAndDatabaseHealthIndicator.class
PatientSelfRegistrationLinkService.class
})
@EnableConfigurationProperties({InitialSetupProperties.class, AuthorizationProperties.class})
public class SliceTestConfiguration {
Expand Down
35 changes: 0 additions & 35 deletions frontend/deploy-smoke.js

This file was deleted.

6 changes: 1 addition & 5 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@
"storybook": "yarn create-storybook-public && SASS_PATH=$(cd ./node_modules && pwd):$(cd ./node_modules/@uswds && pwd):$(cd ./node_modules/@uswds/uswds/packages && pwd):$(cd ./src/scss && pwd) storybook dev -p 6006 -s ../storybook_public",
"build-storybook": "yarn create-storybook-public && REACT_APP_BACKEND_URL=http://localhost:8080 SASS_PATH=$(cd ./node_modules && pwd):$(cd ./node_modules/@uswds && pwd):$(cd ./node_modules/@uswds/uswds/packages && pwd):$(cd ./src/scss && pwd) storybook build -s storybook_public",
"maintenance:start": "[ -z \"$MAINTENANCE_MESSAGE\" ] && echo \"MAINTENANCE_MESSAGE must be set!\" || (echo $MAINTENANCE_MESSAGE > maintenance.json && yarn maintenance:deploy && rm maintenance.json)",
"maintenance:deploy": "[ -z \"$MAINTENANCE_ENV\" ] && echo \"MAINTENANCE_ENV must be set!\" || az storage blob upload -f maintenance.json -n maintenance.json -c '$web' --account-name simplereport${MAINTENANCE_ENV}app --overwrite",
"smoke:deploy:local": "node -r dotenv/config deploy-smoke.js dotenv_config_path=.env.local",
"smoke:deploy:ci": "node -r dotenv/config deploy-smoke.js dotenv_config_path=.env.production.local"
"maintenance:deploy": "[ -z \"$MAINTENANCE_ENV\" ] && echo \"MAINTENANCE_ENV must be set!\" || az storage blob upload -f maintenance.json -n maintenance.json -c '$web' --account-name simplereport${MAINTENANCE_ENV}app --overwrite"
},
"prettier": {
"singleQuote": false
Expand Down Expand Up @@ -207,7 +205,6 @@
"chromatic": "^6.10.2",
"dayjs": "^1.10.7",
"depcheck": "^1.4.3",
"dotenv": "^16.3.1",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-graphql": "^4.0.0",
"eslint-plugin-import": "^2.29.0",
Expand All @@ -227,7 +224,6 @@
"prettier": "^2.8.4",
"redux-mock-store": "^1.5.4",
"sass": "^1.63.6",
"selenium-webdriver": "^4.16.0",
"storybook": "^7.5.2",
"storybook-addon-apollo-client": "^5.0.0",
"stylelint": "^13.13.1",
Expand Down
30 changes: 0 additions & 30 deletions frontend/src/app/DeploySmokeTest.test.tsx

This file was deleted.

27 changes: 0 additions & 27 deletions frontend/src/app/DeploySmokeTest.tsx

This file was deleted.

3 changes: 0 additions & 3 deletions frontend/src/app/HealthChecks.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
import { Route, Routes } from "react-router-dom";

import DeploySmokeTest from "./DeploySmokeTest";

const HealthChecks = () => (
<Routes>
<Route path="ping" element={<div>pong</div>} />
<Route
path="commit"
element={<div>{process.env.REACT_APP_CURRENT_COMMIT}</div>}
/>
<Route path="deploy-smoke-test" element={<DeploySmokeTest />} />
</Routes>
);

Expand Down
Loading

0 comments on commit 3df3157

Please sign in to comment.