Skip to content

Commit

Permalink
redis gcp
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesWoolfenden committed Oct 30, 2023
1 parent 1ac8d7f commit 25e44cf
Show file tree
Hide file tree
Showing 15 changed files with 54 additions and 50 deletions.
6 changes: 6 additions & 0 deletions src/files_gcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -177,3 +177,9 @@ var googleSecretManagerSecretIam []byte

//go:embed mapping/google/resource/secretmanager/google_secret_manager_secret_version.json
var googleSecretManagerSecretVersion []byte

//go:embed mapping/google/resource/redis/google_redis_instance.json
var googleRedisInstance []byte

//go:embed mapping/google/resource/resourcemanager/google_project_service.json
var googleProjectService []byte
4 changes: 2 additions & 2 deletions src/files_gcp_datasource.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,5 +169,5 @@ var dataGoogleServiceAccountJwt []byte
//go:embed mapping/google/data/iam/google_service_account_key.json
var dataGoogleServiceAccountKey []byte

//go:embed mapping/google/data/resourcemanager/google_project_service.json
var googleProjectService []byte
//go:embed mapping/google/data/redis/google_redis_instance.json
var dataGoogleRedisInstance []byte
1 change: 1 addition & 0 deletions src/gcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ func GCPLookup(result string) interface{} {
"google_storage_bucket_acl": googleStorageBucketACL,
"google_storage_bucket_iam_binding": googleStorageBucketIamBinding,
"google_storage_bucket_object": googleStorageBucketObject,
"google_redis_instance": googleRedisInstance,
}

return TFLookup[result]
Expand Down
1 change: 1 addition & 0 deletions src/gcp_datasource.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ func GCPDataLookup(result string) interface{} {
"google_service_account_id_token": placeholder,
"google_service_account_jwt": dataGoogleServiceAccountJwt,
"google_service_account_key": dataGoogleServiceAccountKey,
"google_redis_instance": dataGoogleRedisInstance,
}
return TFLookup[result]
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
},
"destroy": [],
"modify": [],
"plan": []
"plan": [
"redis.instances.get"
]
}
]

This file was deleted.

11 changes: 0 additions & 11 deletions src/mapping/google/resource/google_redis_instance.json

This file was deleted.

23 changes: 23 additions & 0 deletions src/mapping/google/resource/redis/google_redis_instance.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[
{
"apply": [
"redis.instances.get",
"redis.instances.create",
"redis.operations.get",
"redis.instances.update",
"redis.instances.delete"
],
"attributes": {
"tags": []
},
"destroy": [
"redis.instances.delete"
],
"modify": [
"redis.instances.update"
],
"plan": [
"redis.instances.get"
]
}
]
3 changes: 3 additions & 0 deletions terraform/google/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,7 @@ init:
role: FORCE
GOOGLE_CLOUD_KEYFILE_JSON="" terraform -chdir=./role apply -auto-approve

role_init:
GOOGLE_CLOUD_KEYFILE_JSON="" terraform -chdir=./role init

FORCE:
3 changes: 3 additions & 0 deletions terraform/google/backup/data.google_redis_instance.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
data "google_redis_instance" "pike" {
name = google_redis_instance.pike.name
}
7 changes: 7 additions & 0 deletions terraform/google/backup/google_redis_instance.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
resource "google_redis_instance" "pike" {
name = "pike"
memory_size_gb = 1
labels = {
pike = "permissions"
}
}
1 change: 0 additions & 1 deletion terraform/google/data.google_redis_instance.tf

This file was deleted.

1 change: 0 additions & 1 deletion terraform/google/google_app_engine_standard_app_version.tf

This file was deleted.

1 change: 0 additions & 1 deletion terraform/google/google_redis_instance.tf

This file was deleted.

27 changes: 5 additions & 22 deletions terraform/google/role/google_project_iam_custom_role.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,10 @@ resource "google_project_iam_custom_role" "pike" {
title = "pike terraform user"
description = "A user with least privileges"
permissions = [
"resourcemanager.projects.get",

//google_pubsub_topic_iam_member
"pubsub.topics.getIamPolicy",
"pubsub.topics.setIamPolicy",

//google_secret_manager_secret
"secretmanager.secrets.create",
"secretmanager.secrets.get",
"secretmanager.secrets.update",
"secretmanager.secrets.delete",

//google_secret_manager_secret_iam_member
"secretmanager.secrets.getIamPolicy",
"secretmanager.secrets.setIamPolicy",

//google_secret_manager_secret_version
"secretmanager.versions.add",
"secretmanager.versions.enable",
"secretmanager.versions.get",
"secretmanager.versions.access",
"secretmanager.versions.destroy"
"redis.instances.get",
"redis.instances.create",
"redis.operations.get",
"redis.instances.update",
"redis.instances.delete"
]
}

0 comments on commit 25e44cf

Please sign in to comment.