Skip to content

Commit be6a290

Browse files
Ak-skyAk-sky
authored
feat: Updated services list to support CBR <br> - New supported services "atracker", "logs", "ghost-tags"<br> - Deprecated services "databases-for-cassandra", "logdna", "logdnaat" (#641)
* feat: added new CBR supported services * feat: added new CBR supported services * feat: added new CBR supported services * update sevices
1 parent bce717a commit be6a290

File tree

3 files changed

+41
-53
lines changed

3 files changed

+41
-53
lines changed

‎modules/cbr-service-profile/variables.tf‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,7 @@ variable "target_service_details" {
4949
validation {
5050
condition = alltrue([
5151
for service_detail in var.target_service_details :
52-
contains(["iam-groups", "iam-access-management", "iam-identity",
53-
"user-management", "cloud-object-storage", "codeengine",
54-
"container-registry", "databases-for-cassandra",
55-
"databases-for-enterprisedb", "databases-for-elasticsearch",
56-
"databases-for-etcd", "databases-for-mongodb",
57-
"databases-for-mysql", "databases-for-postgresql", "databases-for-redis",
58-
"directlink", "dns-svcs", "messagehub", "kms", "containers-kubernetes",
59-
"messages-for-rabbitmq", "secrets-manager", "transit", "is",
60-
"schematics", "apprapp", "event-notifications", "compliance", "logdna", "logdnaat"], service_detail.target_service_name)
52+
contains(["apprapp", "atracker", "cloud-object-storage", "codeengine", "compliance", "container-registry", "containers-kubernetes", "context-based-restrictions", "databases-for-elasticsearch", "databases-for-enterprisedb", "databases-for-etcd", "databases-for-mongodb", "databases-for-mysql", "databases-for-postgresql", "databases-for-redis", "directlink", "dns-svcs", "event-notifications", "ghost-tags", "globalcatalog-collection", "hs-crypto", "IAM", "iam-access-management", "iam-groups", "iam-identity", "is", "kms", "logs", "messagehub", "messages-for-rabbitmq", "mqcloud", "schematics", "secrets-manager", "sysdig-monitor", "sysdig-secure", "transit", "user-management"], service_detail.target_service_name)
6153
])
6254
error_message = "Provide a valid target service name that is supported by context-based restrictions"
6355
}

‎modules/fscloud/main.tf‎

Lines changed: 38 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,10 @@ locals {
99
service_group_ids = ["IAM"] # List of pseudo services for which service_group_id is required
1010

1111
target_service_details_default = {
12-
"iam-groups" : {
13-
"enforcement_mode" : "report"
14-
},
15-
"iam-access-management" : {
16-
"enforcement_mode" : "report"
17-
},
18-
"iam-identity" : {
12+
"apprapp" : {
1913
"enforcement_mode" : "report"
2014
},
21-
"user-management" : {
15+
"atracker" : {
2216
"enforcement_mode" : "report"
2317
},
2418
"cloud-object-storage" : {
@@ -27,24 +21,36 @@ locals {
2721
"codeengine" : {
2822
"enforcement_mode" : "report"
2923
},
24+
"codeengine-platform" : {
25+
"enforcement_mode" : "report"
26+
},
3027
"codeengine-service-control-plane" : {
3128
"enforcement_mode" : "report"
3229
},
33-
"codeengine-platform" : {
30+
"compliance" : {
3431
"enforcement_mode" : "report"
3532
},
3633
"container-registry" : {
3734
"enforcement_mode" : "report"
3835
},
39-
"databases-for-cassandra" : {
36+
"containers-kubernetes" : {
4037
"enforcement_mode" : "disabled"
4138
},
42-
"databases-for-enterprisedb" : {
39+
"containers-kubernetes-cluster" : {
4340
"enforcement_mode" : "disabled"
4441
},
42+
"containers-kubernetes-management" : {
43+
"enforcement_mode" : "disabled"
44+
},
45+
"context-based-restrictions" : {
46+
"enforcement_mode" : "report"
47+
},
4548
"databases-for-elasticsearch" : {
4649
"enforcement_mode" : "disabled"
4750
},
51+
"databases-for-enterprisedb" : {
52+
"enforcement_mode" : "disabled"
53+
},
4854
"databases-for-etcd" : {
4955
"enforcement_mode" : "disabled"
5056
},
@@ -66,61 +72,49 @@ locals {
6672
"dns-svcs" : {
6773
"enforcement_mode" : "report"
6874
},
69-
"messagehub" : {
75+
"event-notifications" : {
76+
"enforcement_mode" : "disabled"
77+
},
78+
"ghost-tags" : {
7079
"enforcement_mode" : "report"
7180
},
72-
"kms" : {
81+
"globalcatalog-collection" : {
7382
"enforcement_mode" : "report"
7483
},
7584
"hs-crypto" : {
7685
"enforcement_mode" : "report"
7786
},
78-
"containers-kubernetes" : {
79-
"enforcement_mode" : "disabled"
80-
},
81-
"containers-kubernetes-management" : {
82-
"enforcement_mode" : "disabled"
83-
},
84-
"containers-kubernetes-cluster" : {
85-
"enforcement_mode" : "disabled"
86-
},
87-
"messages-for-rabbitmq" : {
88-
"enforcement_mode" : "disabled"
89-
},
90-
"secrets-manager" : {
87+
"IAM" : {
9188
"enforcement_mode" : "report"
9289
},
93-
"transit" : {
90+
"iam-access-management" : {
9491
"enforcement_mode" : "report"
9592
},
96-
"is" : {
93+
"iam-groups" : {
9794
"enforcement_mode" : "report"
9895
},
99-
"schematics" : {
96+
"iam-identity" : {
10097
"enforcement_mode" : "report"
10198
},
102-
"apprapp" : {
99+
"is" : {
103100
"enforcement_mode" : "report"
104101
},
105-
"event-notifications" : {
106-
"enforcement_mode" : "disabled"
107-
},
108-
"compliance" : {
102+
"kms" : {
109103
"enforcement_mode" : "report"
110104
},
111-
"IAM" : {
105+
"logs" : {
112106
"enforcement_mode" : "report"
113107
},
114-
"context-based-restrictions" : {
108+
"messagehub" : {
115109
"enforcement_mode" : "report"
116110
},
117-
"globalcatalog-collection" : {
118-
"enforcement_mode" : "report"
111+
"messages-for-rabbitmq" : {
112+
"enforcement_mode" : "disabled"
119113
},
120-
"logdna" : {
114+
"schematics" : {
121115
"enforcement_mode" : "report"
122116
},
123-
"logdnaat" : {
117+
"secrets-manager" : {
124118
"enforcement_mode" : "report"
125119
},
126120
"sysdig-monitor" : {
@@ -129,7 +123,10 @@ locals {
129123
"sysdig-secure" : {
130124
"enforcement_mode" : "report"
131125
},
132-
"logs" : {
126+
"transit" : {
127+
"enforcement_mode" : "report"
128+
},
129+
"user-management" : {
133130
"enforcement_mode" : "report"
134131
}
135132
}
@@ -383,7 +380,6 @@ locals {
383380
icd_api_types = ["crn:v1:bluemix:public:context-based-restrictions::::api-type:data-plane"]
384381
operations_apitype_val = {
385382
databases-for-enterprisedb = local.icd_api_types,
386-
containers-kubernetes = ["crn:v1:bluemix:public:containers-kubernetes::::api-type:cluster", "crn:v1:bluemix:public:containers-kubernetes::::api-type:management"],
387383
containers-kubernetes-cluster = ["crn:v1:bluemix:public:containers-kubernetes::::api-type:cluster"],
388384
containers-kubernetes-management = ["crn:v1:bluemix:public:containers-kubernetes::::api-type:management"]
389385
databases-for-cassandra = local.icd_api_types,

‎modules/fscloud/variables.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ variable "target_service_details" {
310310
validation {
311311
condition = alltrue([
312312
for target_service_name, _ in var.target_service_details :
313-
contains(["IAM", "apprapp", "cloud-object-storage", "codeengine", "compliance", "container-registry", "containers-kubernetes", "containers-kubernetes-cluster", "containers-kubernetes-management", "context-based-restrictions", "databases-for-cassandra", "databases-for-elasticsearch", "databases-for-enterprisedb", "databases-for-etcd", "databases-for-mongodb", "databases-for-mysql", "databases-for-postgresql", "databases-for-redis", "directlink", "dns-svcs", "event-notifications", "globalcatalog-collection", "hs-crypto", "iam-access-management", "iam-groups", "iam-identity", "is", "kms", "logdna", "logdnaat", "messagehub", "messages-for-rabbitmq", "mqcloud", "schematics", "secrets-manager", "sysdig-monitor", "sysdig-secure", "transit", "user-management"], target_service_name)
313+
contains(["apprapp", "atracker", "cloud-object-storage", "codeengine", "codeengine-platform", "codeengine-service-control-plane", "compliance", "container-registry", "containers-kubernetes", "containers-kubernetes-cluster", "containers-kubernetes-management", "context-based-restrictions", "databases-for-elasticsearch", "databases-for-enterprisedb", "databases-for-etcd", "databases-for-mongodb", "databases-for-mysql", "databases-for-postgresql", "databases-for-redis", "directlink", "dns-svcs", "event-notifications", "ghost-tags", "globalcatalog-collection", "hs-crypto", "IAM", "iam-access-management", "iam-groups", "iam-identity", "is", "kms", "logs", "messagehub", "messages-for-rabbitmq", "mqcloud", "schematics", "secrets-manager", "sysdig-monitor", "sysdig-secure", "transit", "user-management"], target_service_name)
314314
])
315315
error_message = "Provide a valid target service name that is supported by context-based restrictions"
316316
}
@@ -328,7 +328,7 @@ variable "target_service_details" {
328328
validation {
329329
condition = alltrue([
330330
for target_service_name, attributes in var.target_service_details :
331-
contains(["cloud-object-storage", "codeengine", "container-registry", "containers-kubernetes", "containers-kubernetes-cluster", "containers-kubernetes-management", "databases-for-cassandra", "databases-for-elasticsearch", "databases-for-enterprisedb", "databases-for-etcd", "databases-for-mongodb", "databases-for-mysql", "databases-for-postgresql", "databases-for-redis", "event-notifications", "hs-crypto", "iam-identity", "is", "logdna", "logdnaat", "messagehub", "messages-for-rabbitmq", "mqcloud", "secrets-manager", "sysdig-monitor", "sysdig-secure"], target_service_name) if attributes.region != null
331+
contains(["atracker", "cloud-object-storage", "codeengine", "codeengine-platform", "codeengine-service-control-plane", "container-registry", "containers-kubernetes", "containers-kubernetes-cluster", "containers-kubernetes-management", "databases-for-elasticsearch", "databases-for-enterprisedb", "databases-for-etcd", "databases-for-mongodb", "databases-for-mysql", "databases-for-postgresql", "databases-for-redis", "event-notifications", "hs-crypto", "iam-identity", "is", "logs", "messagehub", "messages-for-rabbitmq", "mqcloud", "secrets-manager", "sysdig-monitor", "sysdig-secure"], target_service_name) if attributes.region != null
332332
])
333333
error_message = "Provide a valid target service name that supports region attribute."
334334
}

0 commit comments

Comments
 (0)