Skip to content

Commit 18c37ca

Browse files
Maarten AlbrechtMaxrovr
Maarten Albrecht
authored and
Maxrovr
committed
Added - apm_config: support for usage and ownership details
1 parent 2744817 commit 18c37ca

9 files changed

+274
-22
lines changed

‎internal/integrationtest/apm_config_apdex_test.go‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ var (
5858
"apm_domain_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_apm_apm_domain.test_apm_domain.id}`},
5959
"config_type": acctest.Representation{RepType: acctest.Required, Create: configTypeApdex, Update: configTypeApdex},
6060
"display_name": acctest.Representation{RepType: acctest.Required, Create: `displayName`, Update: `displayName2`},
61-
"defined_tags": acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
61+
"defined_tags": acctest.Representation{RepType: acctest.Optional,
62+
Create: `${tomap({"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "value"})}`,
63+
Update: `${tomap({"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "updatedValue"})}`},
6264
"freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
6365
"rules": acctest.RepresentationGroup{RepType: acctest.Required, Group: configRulesRepresentation},
6466
}
@@ -114,6 +116,9 @@ func TestApmConfigApdexResource_basic(t *testing.T) {
114116
resource.TestCheckResourceAttr(resourceName, "rules.#", "1"),
115117
resource.TestCheckResourceAttr(resourceName, "rules.0.filter_text", createRulesFilterText),
116118
resource.TestCheckResourceAttr(resourceName, "rules.0.priority", "10"),
119+
resource.TestCheckResourceAttrSet(resourceName, "created_by"),
120+
resource.TestCheckResourceAttrSet(resourceName, "updated_by"),
121+
resource.TestCheckResourceAttrSet(resourceName, "etag"),
117122

118123
func(s *terraform.State) (err error) {
119124
resId, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -143,6 +148,9 @@ func TestApmConfigApdexResource_basic(t *testing.T) {
143148
resource.TestCheckResourceAttr(resourceName, "rules.0.priority", "10"),
144149
resource.TestCheckResourceAttr(resourceName, "rules.0.satisfied_response_time", "10"),
145150
resource.TestCheckResourceAttr(resourceName, "rules.0.tolerating_response_time", "10"),
151+
resource.TestCheckResourceAttrSet(resourceName, "created_by"),
152+
resource.TestCheckResourceAttrSet(resourceName, "updated_by"),
153+
resource.TestCheckResourceAttrSet(resourceName, "etag"),
146154

147155
func(s *terraform.State) (err error) {
148156
resId, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -173,6 +181,9 @@ func TestApmConfigApdexResource_basic(t *testing.T) {
173181
resource.TestCheckResourceAttr(resourceName, "rules.0.priority", "11"),
174182
resource.TestCheckResourceAttr(resourceName, "rules.0.satisfied_response_time", "11"),
175183
resource.TestCheckResourceAttr(resourceName, "rules.0.tolerating_response_time", "11"),
184+
resource.TestCheckResourceAttrSet(resourceName, "created_by"),
185+
resource.TestCheckResourceAttrSet(resourceName, "updated_by"),
186+
resource.TestCheckResourceAttrSet(resourceName, "etag"),
176187

177188
func(s *terraform.State) (err error) {
178189
resId2, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -203,7 +214,9 @@ func TestApmConfigApdexResource_basic(t *testing.T) {
203214
resource.TestCheckResourceAttrSet(singularDatasourceName, "apm_domain_id"),
204215
resource.TestCheckResourceAttrSet(singularDatasourceName, "config_id"),
205216

217+
resource.TestCheckResourceAttrSet(singularDatasourceName, "created_by"),
206218
resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "displayName2"),
219+
resource.TestCheckResourceAttrSet(singularDatasourceName, "etag"),
207220
resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
208221
resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
209222
resource.TestCheckResourceAttr(singularDatasourceName, "rules.#", "1"),
@@ -216,9 +229,10 @@ func TestApmConfigApdexResource_basic(t *testing.T) {
216229
resource.TestCheckResourceAttr(singularDatasourceName, "rules.0.tolerating_response_time", "11"),
217230
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
218231
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_updated"),
232+
resource.TestCheckResourceAttrSet(singularDatasourceName, "updated_by"),
219233
),
220234
},
221-
// Step 7 verify resource import
235+
// Step 6 verify resource import
222236
{
223237
Config: config + ConfigApdexRequiredOnlyResource,
224238
ImportState: true,

‎internal/integrationtest/apm_config_config_test.go‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ var (
5959
"config_type": acctest.Representation{RepType: acctest.Required, Create: configTypeSpanFilter, Update: configTypeSpanFilter},
6060
"display_name": acctest.Representation{RepType: acctest.Required, Create: `displayName`, Update: `displayName2`},
6161
"filter_text": acctest.Representation{RepType: acctest.Required, Create: createFilterText, Update: updateFilterText},
62-
"defined_tags": acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
62+
"defined_tags": acctest.Representation{RepType: acctest.Optional,
63+
Create: `${tomap({"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "value"})}`,
64+
Update: `${tomap({"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "updatedValue"})}`},
6365
"description": acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
6466
"freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
6567
}
@@ -106,6 +108,10 @@ func TestApmConfigConfigResource_basic(t *testing.T) {
106108
resource.TestCheckResourceAttr(resourceName, "config_type", configTypeSpanFilter),
107109
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
108110
resource.TestCheckResourceAttr(resourceName, "filter_text", createFilterText),
111+
resource.TestCheckResourceAttrSet(resourceName, "created_by"),
112+
resource.TestCheckResourceAttrSet(resourceName, "updated_by"),
113+
resource.TestCheckResourceAttrSet(resourceName, "etag"),
114+
resource.TestCheckResourceAttr(resourceName, "in_use_by.0.items.#", "0"),
109115

110116
func(s *terraform.State) (err error) {
111117
resId, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -129,6 +135,10 @@ func TestApmConfigConfigResource_basic(t *testing.T) {
129135
resource.TestCheckResourceAttr(resourceName, "filter_text", createFilterText),
130136
resource.TestCheckResourceAttr(resourceName, "description", "description"),
131137
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
138+
resource.TestCheckResourceAttrSet(resourceName, "created_by"),
139+
resource.TestCheckResourceAttrSet(resourceName, "updated_by"),
140+
resource.TestCheckResourceAttrSet(resourceName, "etag"),
141+
resource.TestCheckResourceAttr(resourceName, "in_use_by.0.items.#", "0"),
132142

133143
func(s *terraform.State) (err error) {
134144
resId, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -153,6 +163,10 @@ func TestApmConfigConfigResource_basic(t *testing.T) {
153163
resource.TestCheckResourceAttrSet(resourceName, "id"),
154164
resource.TestCheckResourceAttr(resourceName, "filter_text", updateFilterText),
155165
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
166+
resource.TestCheckResourceAttrSet(resourceName, "created_by"),
167+
resource.TestCheckResourceAttrSet(resourceName, "updated_by"),
168+
resource.TestCheckResourceAttrSet(resourceName, "etag"),
169+
resource.TestCheckResourceAttr(resourceName, "in_use_by.0.items.#", "0"),
156170

157171
func(s *terraform.State) (err error) {
158172
resId2, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -183,13 +197,17 @@ func TestApmConfigConfigResource_basic(t *testing.T) {
183197
resource.TestCheckResourceAttrSet(singularDatasourceName, "apm_domain_id"),
184198
resource.TestCheckResourceAttrSet(singularDatasourceName, "config_id"),
185199

200+
resource.TestCheckResourceAttrSet(singularDatasourceName, "created_by"),
186201
resource.TestCheckResourceAttr(singularDatasourceName, "description", "description2"),
187202
resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "displayName2"),
203+
resource.TestCheckResourceAttrSet(singularDatasourceName, "etag"),
188204
resource.TestCheckResourceAttr(singularDatasourceName, "filter_text", updateFilterText),
189205
resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
190206
resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
191207
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
192208
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_updated"),
209+
resource.TestCheckResourceAttrSet(singularDatasourceName, "updated_by"),
210+
resource.TestCheckResourceAttr(singularDatasourceName, "in_use_by.0.items.#", "0"),
193211
),
194212
},
195213
// Step 6 remove singular datasource from previous step so that it doesn't conflict with import tests

‎internal/integrationtest/apm_config_metric_group_test.go‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ var (
5151
configMetricGroupRepresentation = map[string]interface{}{
5252
"apm_domain_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_apm_apm_domain.test_apm_domain.id}`},
5353
"config_type": acctest.Representation{RepType: acctest.Required, Create: configTypeMetricGroup, Update: configTypeMetricGroup},
54-
"defined_tags": acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
54+
"defined_tags": acctest.Representation{RepType: acctest.Optional,
55+
Create: `${tomap({"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "value"})}`,
56+
Update: `${tomap({"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "updatedValue"})}`},
5557
"freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
5658
"display_name": acctest.Representation{RepType: acctest.Required, Create: `displayName`, Update: `displayName2`},
5759
"filter_id": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_apm_config_config.test_span_filter.id}`},
@@ -105,6 +107,9 @@ func TestApmConfigMetricGroupResource_basic(t *testing.T) {
105107
resource.TestCheckResourceAttr(spanFilterResourceName, "config_type", configTypeSpanFilter),
106108
resource.TestCheckResourceAttr(spanFilterResourceName, "display_name", "displayName"),
107109
resource.TestCheckResourceAttr(spanFilterResourceName, "filter_text", createFilterText),
110+
resource.TestCheckResourceAttrSet(spanFilterResourceName, "created_by"),
111+
resource.TestCheckResourceAttrSet(spanFilterResourceName, "updated_by"),
112+
resource.TestCheckResourceAttrSet(spanFilterResourceName, "etag"),
108113

109114
func(s *terraform.State) (err error) {
110115
resId, err = acctest.FromInstanceState(s, spanFilterResourceName, "id")
@@ -122,6 +127,9 @@ func TestApmConfigMetricGroupResource_basic(t *testing.T) {
122127
resource.TestCheckResourceAttr(metricGroupResourceName, "config_type", configTypeMetricGroup),
123128
resource.TestCheckResourceAttr(metricGroupResourceName, "display_name", "displayName"),
124129
resource.TestCheckResourceAttrSet(metricGroupResourceName, "filter_id"),
130+
resource.TestCheckResourceAttrSet(metricGroupResourceName, "created_by"),
131+
resource.TestCheckResourceAttrSet(metricGroupResourceName, "updated_by"),
132+
resource.TestCheckResourceAttrSet(metricGroupResourceName, "etag"),
125133

126134
func(s *terraform.State) (err error) {
127135
resId, err = acctest.FromInstanceState(s, metricGroupResourceName, "id")
@@ -149,6 +157,9 @@ func TestApmConfigMetricGroupResource_basic(t *testing.T) {
149157
resource.TestCheckResourceAttr(metricGroupResourceName, "metrics.0.name", "ThreadCpuTime"),
150158
resource.TestCheckResourceAttr(metricGroupResourceName, "metrics.0.unit", "unit"),
151159
resource.TestCheckResourceAttr(metricGroupResourceName, "namespace", "oracle_apm_monitoring"),
160+
resource.TestCheckResourceAttrSet(metricGroupResourceName, "created_by"),
161+
resource.TestCheckResourceAttrSet(metricGroupResourceName, "updated_by"),
162+
resource.TestCheckResourceAttrSet(metricGroupResourceName, "etag"),
152163

153164
func(s *terraform.State) (err error) {
154165
resId, err = acctest.FromInstanceState(s, metricGroupResourceName, "id")
@@ -190,14 +201,17 @@ func TestApmConfigMetricGroupResource_basic(t *testing.T) {
190201
resource.TestCheckResourceAttrSet(singularMGDatasourceName, "apm_domain_id"),
191202
resource.TestCheckResourceAttrSet(singularMGDatasourceName, "id"),
192203
resource.TestCheckResourceAttr(singularMGDatasourceName, "config_type", configTypeMetricGroup),
204+
resource.TestCheckResourceAttrSet(singularMGDatasourceName, "created_by"),
193205
resource.TestCheckResourceAttr(singularMGDatasourceName, "display_name", "displayName2"),
206+
resource.TestCheckResourceAttrSet(singularMGDatasourceName, "etag"),
194207
resource.TestCheckResourceAttrSet(singularMGDatasourceName, "filter_id"),
195208
resource.TestCheckResourceAttr(singularMGDatasourceName, "freeform_tags.%", "1"),
196209
resource.TestCheckResourceAttr(singularMGDatasourceName, "metrics.#", "1"),
197210
resource.TestCheckResourceAttr(singularMGDatasourceName, "metrics.0.description", "description2"),
198211
resource.TestCheckResourceAttr(singularMGDatasourceName, "metrics.0.name", "PageResponseTime"),
199212
resource.TestCheckResourceAttr(singularMGDatasourceName, "metrics.0.unit", "unit2"),
200213
resource.TestCheckResourceAttr(singularMGDatasourceName, "namespace", "oracle_apm_rum"),
214+
resource.TestCheckResourceAttrSet(singularMGDatasourceName, "updated_by"),
201215
),
202216
},
203217
// Step 8 verify resource import

‎internal/integrationtest/apm_config_options_test.go‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ var (
5151
configOptionsRepresentation = map[string]interface{}{
5252
"apm_domain_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_apm_apm_domain.test_apm_domain.id}`},
5353
"config_type": acctest.Representation{RepType: acctest.Required, Create: configTypeOptions, Update: configTypeOptions},
54-
"defined_tags": acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
54+
"defined_tags": acctest.Representation{RepType: acctest.Optional,
55+
Create: `${tomap({"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "value"})}`,
56+
Update: `${tomap({"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "updatedValue"})}`},
5557
"freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
5658
"display_name": acctest.Representation{RepType: acctest.Required, Create: `displayName`, Update: `displayName2`},
5759
"group": acctest.Representation{RepType: acctest.Required, Create: `group`, Update: `group2`},
@@ -96,6 +98,9 @@ func TestApmConfigOptionsResource_basic(t *testing.T) {
9698
resource.TestCheckResourceAttr(optionsResourceName, "config_type", configTypeOptions),
9799
resource.TestCheckResourceAttr(optionsResourceName, "display_name", "displayName"),
98100
resource.TestCheckResourceAttr(optionsResourceName, "group", "group"),
101+
resource.TestCheckResourceAttrSet(optionsResourceName, "created_by"),
102+
resource.TestCheckResourceAttrSet(optionsResourceName, "updated_by"),
103+
resource.TestCheckResourceAttrSet(optionsResourceName, "etag"),
99104

100105
func(s *terraform.State) (err error) {
101106
resId, err = acctest.FromInstanceState(s, optionsResourceName, "id")
@@ -120,6 +125,9 @@ func TestApmConfigOptionsResource_basic(t *testing.T) {
120125
resource.TestCheckResourceAttrSet(optionsResourceName, "options"),
121126
resource.TestCheckResourceAttr(optionsResourceName, "freeform_tags.%", "1"),
122127
resource.TestCheckResourceAttr(optionsResourceName, "defined_tags.%", "1"),
128+
resource.TestCheckResourceAttrSet(optionsResourceName, "created_by"),
129+
resource.TestCheckResourceAttrSet(optionsResourceName, "updated_by"),
130+
resource.TestCheckResourceAttrSet(optionsResourceName, "etag"),
123131

124132
func(s *terraform.State) (err error) {
125133
resId, err = acctest.FromInstanceState(s, optionsResourceName, "id")
@@ -161,14 +169,17 @@ func TestApmConfigOptionsResource_basic(t *testing.T) {
161169
resource.TestCheckResourceAttrSet(singularOptionsDatasourceName, "apm_domain_id"),
162170
resource.TestCheckResourceAttrSet(singularOptionsDatasourceName, "id"),
163171
resource.TestCheckResourceAttr(singularOptionsDatasourceName, "config_type", configTypeOptions),
172+
resource.TestCheckResourceAttrSet(singularOptionsDatasourceName, "created_by"),
164173
resource.TestCheckResourceAttr(singularOptionsDatasourceName, "display_name", "displayName2"),
174+
resource.TestCheckResourceAttrSet(singularOptionsDatasourceName, "etag"),
165175
resource.TestCheckResourceAttr(singularOptionsDatasourceName, "group", "group2"),
166176
resource.TestCheckResourceAttrSet(singularOptionsDatasourceName, "options"),
167177
resource.TestCheckResourceAttr(singularOptionsDatasourceName, "freeform_tags.%", "1"),
168178
resource.TestCheckResourceAttr(singularOptionsDatasourceName, "defined_tags.%", "1"),
179+
resource.TestCheckResourceAttrSet(singularOptionsDatasourceName, "updated_by"),
169180
),
170181
},
171-
// Step 8 verify resource import
182+
// Step 7 verify resource import
172183
{
173184
Config: config + ConfigOptionsRequiredOnlyResource,
174185
ImportState: true,

0 commit comments

Comments
 (0)