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

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
2 changed files with 74 additions and 75 deletions

View File

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

View File

@@ -69,7 +69,7 @@ type StateStoreBackend struct {
type S3Bucket struct {
BucketName string `json:"anonymizedBucketName" 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 {