Skip to content

Commit 5c2f9df

Browse files
authored
Remove petadoptions history (#339)
1 parent 1212ca6 commit 5c2f9df

File tree

11 files changed

+2
-614
lines changed

11 files changed

+2
-614
lines changed

.github/workflows/build-test.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ on:
55
branches: [ main, staging ]
66
paths:
77
- 'PetAdoptions/payforadoption-go/**'
8-
- 'PetAdoptions/petadoptionshistory-py/**'
98
- 'PetAdoptions/pethistory/**'
10-
- 'PetAdoptions/petlistadoptions-go/**'
9+
- 'PetAdoptions/petlistadoptions-py/**'
1110
- 'PetAdoptions/petsearch-java/**'
1211
- 'PetAdoptions/petsite/**'
1312
- 'PetAdoptions/petstatusupdater/**'
@@ -16,9 +15,8 @@ on:
1615
branches: [ main, staging ]
1716
paths:
1817
- 'PetAdoptions/payforadoption-go/**'
19-
- 'PetAdoptions/petadoptionshistory-py/**'
2018
- 'PetAdoptions/pethistory/**'
21-
- 'PetAdoptions/petlistadoptions-go/**'
19+
- 'PetAdoptions/petlistadoptions-py/**'
2220
- 'PetAdoptions/petsearch-java/**'
2321
- 'PetAdoptions/petsite/**'
2422
- 'PetAdoptions/petstatusupdater/**'
@@ -33,8 +31,6 @@ jobs:
3331
service:
3432
- name: payforadoption-go
3533
path: PetAdoptions/payforadoption-go
36-
- name: petadoptionshistory-py
37-
path: PetAdoptions/petadoptionshistory-py
3834
- name: petlistadoptions-py
3935
path: PetAdoptions/petlistadoptions-py
4036
- name: petsearch-java

PetAdoptions/cdk/pet_stack/lib/applications.ts

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { Stack, StackProps, CfnJson, Fn, CfnOutput } from 'aws-cdk-lib';
88
import { readFileSync } from 'fs';
99
import { Construct } from 'constructs'
1010
import { ContainerImageBuilderProps, ContainerImageBuilder } from './common/container-image-builder'
11-
import { PetAdoptionsHistory } from './applications/pet-adoptions-history-application'
1211
import { KubectlV31Layer } from '@aws-cdk/lambda-layer-kubectl-v31';
1312

1413
export class Applications extends Stack {
@@ -93,27 +92,6 @@ export class Applications extends Stack {
9392
manifest: deploymentYaml
9493
});
9594

96-
// PetAdoptionsHistory application definitions-----------------------------------------------------------------------
97-
const petAdoptionsHistoryContainerImage = new ContainerImageBuilder(this, 'pet-adoptions-history-container-image', {
98-
repositoryName: "pet-adoptions-history",
99-
dockerImageAssetDirectory: "./resources/microservices/petadoptionshistory-py",
100-
});
101-
new ssm.StringParameter(this,"putPetAdoptionHistoryRepositoryName",{
102-
stringValue: petAdoptionsHistoryContainerImage.repositoryUri,
103-
parameterName: '/petstore/pethistoryrepositoryuri'
104-
});
105-
106-
const petAdoptionsHistoryApplication = new PetAdoptionsHistory(this, 'pet-adoptions-history-application', {
107-
cluster: cluster,
108-
app_trustRelationship: app_trustRelationship,
109-
kubernetesManifestPath: "./resources/microservices/petadoptionshistory-py/deployment.yaml",
110-
otelConfigMapPath: "./resources/microservices/petadoptionshistory-py/otel-collector-config.yaml",
111-
rdsSecretArn: rdsSecretArn,
112-
region: region,
113-
imageUri: petAdoptionsHistoryContainerImage.imageUri,
114-
targetGroupArn: petHistoryTargetGroupArn
115-
});
116-
11795
this.createSsmParameters(new Map(Object.entries({
11896
'/eks/petsite/stackname': stackName
11997
})));

PetAdoptions/cdk/pet_stack/lib/applications/pet-adoptions-history-application.ts

Lines changed: 0 additions & 112 deletions
This file was deleted.

PetAdoptions/cdk/pet_stack/lib/services.ts

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -312,30 +312,6 @@ export class Services extends Stack {
312312
defaultTargetGroups: [targetGroup],
313313
});
314314

315-
// PetAdoptionHistory - attach service to path /petadoptionhistory on PetSite ALB
316-
const petadoptionshistory_targetGroup = new elbv2.ApplicationTargetGroup(this, 'PetAdoptionsHistoryTargetGroup', {
317-
port: 80,
318-
protocol: elbv2.ApplicationProtocol.HTTP,
319-
vpc: theVPC,
320-
targetType: elbv2.TargetType.IP,
321-
healthCheck: {
322-
path: '/health/status',
323-
}
324-
});
325-
326-
listener.addTargetGroups('PetAdoptionsHistoryTargetGroups', {
327-
priority: 10,
328-
conditions: [
329-
elbv2.ListenerCondition.pathPatterns(['/petadoptionshistory/*']),
330-
],
331-
targetGroups: [petadoptionshistory_targetGroup]
332-
});
333-
334-
new ssm.StringParameter(this, "putPetHistoryParamTargetGroupArn", {
335-
stringValue: petadoptionshistory_targetGroup.targetGroupArn,
336-
parameterName: '/eks/pethistory/TargetGroupArn'
337-
});
338-
339315
// PetSite - EKS Cluster
340316
const clusterAdmin = new iam.Role(this, 'AdminRole', {
341317
assumedBy: new iam.AccountRootPrincipal()
@@ -709,7 +685,6 @@ export class Services extends Stack {
709685
'/petstore/rds-reader-endpoint': auroraCluster.clusterReadEndpoint.hostname,
710686
'/petstore/stackname': stackName,
711687
'/petstore/petsiteurl': `http://${alb.loadBalancerDnsName}`,
712-
'/petstore/pethistoryurl': `http://${alb.loadBalancerDnsName}/petadoptionshistory`,
713688
'/eks/petsite/OIDCProviderUrl': cluster.clusterOpenIdConnectIssuerUrl,
714689
'/eks/petsite/OIDCProviderArn': cluster.openIdConnectProvider.openIdConnectProviderArn,
715690
'/petstore/errormode1': "false"

PetAdoptions/petadoptionshistory-py/Dockerfile

Lines changed: 0 additions & 19 deletions
This file was deleted.

PetAdoptions/petadoptionshistory-py/config.py

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)