varnitgoyal95/infra-provisioner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #38 from navi-infra/INFRA-000

Browse Source 
INFRA-000| Deepak Jain| fixing s3 bucket resources
This commit is contained in:
Deepak Jain
2020-09-09 20:43:20 +05:30
committed by GitHub Enterprise
parent 7e91c62083 13f311277c
commit e5223008f5
2 changed files with 74 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
sample_infra_manifest.json
View File

@@ -1,75 +1,74 @@
{ {
"extraResources": { "extraResources": {
"environment": "dev", "environment": "dev",
"database": { "database": {
"instanceName": "foo-service", "instanceName": "foo-service",
"user": "foo_service_user", "user": "foo_service_user",
"password": "foo_service_password", "password": "foo_service_password",
"sizeInGb": 7, "sizeInGb": 7,
"dbNames": ["foo_service"], "dbNames": ["foo_service"],
"dbExtensions": ["pgcrypto"], "dbExtensions": ["pgcrypto"],
"readonlyUser": "foo_readonly_user", "readonlyUser": "foo_readonly_user",
"readonlyPassword": "foo_readonly_password", "readonlyPassword": "foo_readonly_password",
"applyImmediately": false, "applyImmediately": false,
"performanceInsightsEnabled": false, "performanceInsightsEnabled": false,
"readReplica": { "readReplica": {
"awsInstanceClass": "db.t3.micro", "awsInstanceClass": "db.t3.micro",
"performanceInsightsEnabled": true "performanceInsightsEnabled": true
}, },
"parameters": { "parameters": {
"rds.logical_replication": "1" "rds.logical_replication": "1"
}, },
"rdsAlertThresholds": { "rdsAlertThresholds": {
"cpuUtilization": 70, "cpuUtilization": 70,
"cpuCreditBalance": 120, "cpuCreditBalance": 120,
"burstBalance": 85, "burstBalance": 85,
"dbConnections": 200, "dbConnections": 200,
"queueDepth": 20, "queueDepth": 20,
"freeStorageSpacePercent": 90, "freeStorageSpacePercent": 90,
"freeMemoryTooLowInMB": 150, "freeMemoryTooLowInMB": 150,
"readLatency": 0.5, "readLatency": 0.5,
"writeLatency": 0.5 "writeLatency": 0.5
} }
}, },
"aws_access": { "aws_access": {
"policies": [{ "policies": [
"actions": ["s3:GetObject", "s3:PutObject"], {
"resource": "arn:aws:s3:::navi-e3e2a9bfd88566b05001b02a3f51d286/*" "actions": ["s3:GetObject", "s3:PutObject"],
}, "resource": "arn:aws:s3:::navi-e3e2a9bfd88566b05001b02a3f51d286/*"
{ },
"actions": ["s3:GetObject", "s3:PutObject"], {
"resource": "*" "actions": ["s3:GetObject", "s3:PutObject"],
}, "resource": "*"
{ },
"resource": "arn:aws:s3:::arn:aws:s3:::test-bucket-to-be-deleted/*", {
"actions": ["sns:Publish", "sns:SetSMSAttributes"] "resource": "arn:aws:s3:::arn:aws:s3:::test-bucket-to-be-deleted/*",
} "actions": ["sns:Publish", "sns:SetSMSAttributes"]
] }
}, ]
"s3_buckets": [{ },
"anonymizedBucketName": "navi-bucket-test-1", "s3_buckets": [
"bucketTag": "customer-uploads", {
"lifecycleRules": [{ "anonymizedBucketName": "navi-bucket-test-1",
"expiration": { "bucketTag": "customer-uploads"
"days": 1 },
} {
}] "anonymizedBucketName": "navi-bucket-test-2",
}, "bucketTag": "document-uploads",
{ "lifecycleRules": [
"anonymizedBucketName": "navi-bucket-test-2", {
"bucketTag": "document-uploads", "expiration": {
"lifecycleRules": [{ "days": 1
"expiration": { }
"days": 1 }
} ]
}] }
} ]
] },
}, "team": {
"team": { "name": "Infra"
"name": "Infra" },
}, "deployment": {
"deployment": { "name": "foo"
"name": "foo" }
} }
}

2
types.go
View File

@@ -69,7 +69,7 @@ type StateStoreBackend struct {
type S3Bucket struct { type S3Bucket struct {
BucketName string `json:"anonymizedBucketName" valid:"required"` BucketName string `json:"anonymizedBucketName" valid:"required"`
BucketTag string `json:"bucketTag" valid:"required"` BucketTag string `json:"bucketTag" valid:"required"`
LifecycleRules []map[string]LifecycleRule `json:"lifecycleRules" valid:"required"` LifecycleRules []map[string]LifecycleRule `json:"lifecycleRules"`
} }
type RdsAlertThresholds struct { type RdsAlertThresholds struct {