Skip to content

Commit cbec966

Browse files
varmax2511varmax2511
committed
synchronize with codegen changes for mysql client
1 parent a82a279 commit cbec966

11 files changed

+160
-99
lines changed

‎oci/export_definitions.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,6 +1472,18 @@ var exportMysqlMysqlDbSystemHints = &TerraformResourceHints{
14721472
},
14731473
}
14741474

1475+
var exportMysqlChannelHints = &TerraformResourceHints{
1476+
resourceClass: "oci_mysql_channel",
1477+
datasourceClass: "oci_mysql_channels",
1478+
datasourceItemsAttr: "channels",
1479+
resourceAbbreviation: "channel",
1480+
requireResourceRefresh: true,
1481+
discoverableLifecycleStates: []string{
1482+
string(oci_mysql.ChannelLifecycleStateActive),
1483+
string(oci_mysql.ChannelLifecycleStateNeedsAttention),
1484+
},
1485+
}
1486+
14751487
var exportNosqlTableHints = &TerraformResourceHints{
14761488
resourceClass: "oci_nosql_table",
14771489
datasourceClass: "oci_nosql_tables",

‎oci/export_graphs.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,7 @@ var mysqlResourceGraph = TerraformResourceGraph{
676676
"oci_identity_compartment": {
677677
{TerraformResourceHints: exportMysqlMysqlBackupHints},
678678
{TerraformResourceHints: exportMysqlMysqlDbSystemHints},
679+
{TerraformResourceHints: exportMysqlChannelHints},
679680
},
680681
}
681682

‎oci/mysql_channel_data_source.go‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -67,56 +67,61 @@ func (s *MysqlChannelDataSourceCrud) SetData() error {
6767

6868
s.D.SetId(*s.Res.Id)
6969

70+
if s.Res.CompartmentId != nil {
71+
s.D.Set("compartment_id", *s.Res.CompartmentId)
72+
}
73+
7074
if s.Res.DefinedTags != nil {
7175
s.D.Set("defined_tags", definedTagsToMap(s.Res.DefinedTags))
7276
}
7377

74-
if s.Res.CompartmentId != nil {
75-
s.D.Set("compartment_id", *s.Res.CompartmentId)
78+
if s.Res.Description != nil {
79+
s.D.Set("description", *s.Res.Description)
7680
}
7781

82+
if s.Res.DisplayName != nil {
83+
s.D.Set("display_name", *s.Res.DisplayName)
84+
}
85+
86+
s.D.Set("freeform_tags", s.Res.FreeformTags)
87+
7888
if s.Res.IsEnabled != nil {
7989
s.D.Set("is_enabled", *s.Res.IsEnabled)
8090
}
8191

92+
if s.Res.LifecycleDetails != nil {
93+
s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
94+
}
95+
8296
if s.Res.Source != nil {
8397
sourceArray := []interface{}{}
8498
if sourceMap := ChannelSourceToMap(&s.Res.Source); sourceMap != nil {
8599
sourceArray = append(sourceArray, sourceMap)
86100
}
87101
s.D.Set("source", sourceArray)
102+
} else {
103+
s.D.Set("source", nil)
88104
}
89105

106+
s.D.Set("state", s.Res.LifecycleState)
107+
90108
if s.Res.Target != nil {
91109
targetArray := []interface{}{}
92110
if targetMap := ChannelTargetToMap(&s.Res.Target); targetMap != nil {
93111
targetArray = append(targetArray, targetMap)
94112
}
95113
s.D.Set("target", targetArray)
114+
} else {
115+
s.D.Set("target", nil)
96116
}
97117

98-
s.D.Set("freeform_tags", s.Res.FreeformTags)
99-
100-
if s.Res.Description != nil {
101-
s.D.Set("description", *s.Res.Description)
102-
}
103-
104-
if s.Res.DisplayName != nil {
105-
s.D.Set("display_name", *s.Res.DisplayName)
106-
}
107-
108-
if s.Res.LifecycleDetails != nil {
109-
s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
110-
}
111-
112-
s.D.Set("state", s.Res.LifecycleState)
113-
114118
if s.Res.TimeCreated != nil {
115119
s.D.Set("time_created", s.Res.TimeCreated.String())
116120
}
117121

118122
if s.Res.TimeUpdated != nil {
119123
s.D.Set("time_updated", s.Res.TimeUpdated.String())
120124
}
125+
121126
return nil
122127
}

‎oci/mysql_channel_resource.go‎

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ func MysqlChannelResource() *schema.Resource {
6060
"MYSQL",
6161
}, true),
6262
},
63-
"username": {
63+
"ssl_mode": {
6464
Type: schema.TypeString,
6565
Required: true,
6666
},
67-
"ssl_mode": {
67+
"username": {
6868
Type: schema.TypeString,
6969
Required: true,
7070
},
@@ -184,6 +184,10 @@ func MysqlChannelResource() *schema.Resource {
184184
},
185185

186186
// Computed
187+
"lifecycle_details": {
188+
Type: schema.TypeString,
189+
Computed: true,
190+
},
187191
"state": {
188192
Type: schema.TypeString,
189193
Computed: true,
@@ -451,26 +455,6 @@ func (s *MysqlChannelResourceCrud) SetData() error {
451455
s.D.SetId(*s.Res.Id)
452456
}
453457

454-
if s.Res.IsEnabled != nil {
455-
s.D.Set("is_enabled", *s.Res.IsEnabled)
456-
}
457-
458-
if s.Res.Source != nil {
459-
sourceArray := []interface{}{}
460-
if sourceMap := s.ChannelSourceToMap(&s.Res.Source); sourceMap != nil {
461-
sourceArray = append(sourceArray, sourceMap)
462-
}
463-
s.D.Set("source", sourceArray)
464-
}
465-
466-
if s.Res.Target != nil {
467-
targetArray := []interface{}{}
468-
if targetMap := ChannelTargetToMap(&s.Res.Target); targetMap != nil {
469-
targetArray = append(targetArray, targetMap)
470-
}
471-
s.D.Set("target", targetArray)
472-
}
473-
474458
if s.Res.CompartmentId != nil {
475459
s.D.Set("compartment_id", *s.Res.CompartmentId)
476460
}
@@ -489,18 +473,44 @@ func (s *MysqlChannelResourceCrud) SetData() error {
489473

490474
s.D.Set("freeform_tags", s.Res.FreeformTags)
491475

476+
if s.Res.IsEnabled != nil {
477+
s.D.Set("is_enabled", *s.Res.IsEnabled)
478+
}
479+
492480
if s.Res.LifecycleDetails != nil {
493481
s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
494482
}
495483

484+
if s.Res.Source != nil {
485+
sourceArray := []interface{}{}
486+
if sourceMap := s.ChannelSourceToMap(&s.Res.Source); sourceMap != nil {
487+
sourceArray = append(sourceArray, sourceMap)
488+
}
489+
s.D.Set("source", sourceArray)
490+
} else {
491+
s.D.Set("source", nil)
492+
}
493+
496494
s.D.Set("state", s.Res.LifecycleState)
495+
496+
if s.Res.Target != nil {
497+
targetArray := []interface{}{}
498+
if targetMap := ChannelTargetToMap(&s.Res.Target); targetMap != nil {
499+
targetArray = append(targetArray, targetMap)
500+
}
501+
s.D.Set("target", targetArray)
502+
} else {
503+
s.D.Set("target", nil)
504+
}
505+
497506
if s.Res.TimeCreated != nil {
498507
s.D.Set("time_created", s.Res.TimeCreated.String())
499508
}
500509

501510
if s.Res.TimeUpdated != nil {
502511
s.D.Set("time_updated", s.Res.TimeUpdated.String())
503512
}
513+
504514
return nil
505515
}
506516

@@ -632,6 +642,9 @@ func (s *MysqlChannelResourceCrud) mapToUpdateChannelSourceDetails(fieldKeyForma
632642
details.SslCaCertificate = tmp
633643
}
634644
}
645+
if sslMode, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "ssl_mode")); ok {
646+
details.SslMode = oci_mysql.ChannelSourceMysqlSslModeEnum(sslMode.(string))
647+
}
635648
if username, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "username")); ok {
636649
tmp := username.(string)
637650
details.Username = &tmp

‎oci/mysql_channel_test.go‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ const (
2424
)
2525

2626
var (
27+
ChannelRequiredOnlyResource = ChannelResourceDependencies +
28+
generateResourceFromRepresentationMap("oci_mysql_channel", "test_channel", Required, Create, channelRepresentation)
29+
2730
channelSingularDataSourceRepresentation = map[string]interface{}{
2831
"channel_id": Representation{repType: Required, create: `${oci_mysql_channel.test_channel.id}`},
2932
}
@@ -47,7 +50,7 @@ var (
4750
"defined_tags": Representation{repType: 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")}`},
4851
"description": Representation{repType: Optional, create: `description`, update: `description2`},
4952
"display_name": Representation{repType: Optional, create: `displayName`, update: `displayName2`},
50-
"freeform_tags": Representation{repType: Optional, create: map[string]string{"freeformTags": "freeformTags"}, update: map[string]string{"freeformTags2": "freeformTags2"}},
53+
"freeform_tags": Representation{repType: Optional, create: map[string]string{"bar-key": "value"}, update: map[string]string{"Department": "Accounting"}},
5154
"is_enabled": Representation{repType: Optional, create: `true`, update: `false`},
5255
}
5356

@@ -81,9 +84,6 @@ var (
8184
"channel_name": Representation{repType: Optional, create: `channelname`, update: `channelname2`},
8285
}
8386

84-
ChannelRequiredOnlyResource = ChannelResourceDependencies +
85-
generateResourceFromRepresentationMap("oci_mysql_channel", "test_channel", Required, Create, channelRepresentation)
86-
8787
ChannelWithOptionalsResource = ChannelResourceDependencies +
8888
generateResourceFromRepresentationMap("oci_mysql_channel", "test_channel", Optional, Create, channelRepresentation)
8989

@@ -108,9 +108,7 @@ func TestMysqlChannelResource_basic(t *testing.T) {
108108
compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
109109

110110
resourceName := "oci_mysql_channel.test_channel"
111-
112111
datasourceName := "data.oci_mysql_channels.test_channels"
113-
114112
singularDatasourceName := "data.oci_mysql_channel.test_channel"
115113

116114
var resId, resId2 string
@@ -130,8 +128,8 @@ func TestMysqlChannelResource_basic(t *testing.T) {
130128
resource.TestCheckResourceAttr(resourceName, "source.0.hostname", "hostname.my.company.com"),
131129
resource.TestCheckResourceAttr(resourceName, "source.0.password", "BEstrO0ng_#11"),
132130
resource.TestCheckResourceAttr(resourceName, "source.0.source_type", "MYSQL"),
133-
resource.TestCheckResourceAttr(resourceName, "source.0.username", "username"),
134131
resource.TestCheckResourceAttr(resourceName, "source.0.ssl_mode", "REQUIRED"),
132+
resource.TestCheckResourceAttr(resourceName, "source.0.username", "username"),
135133
resource.TestCheckResourceAttr(resourceName, "target.#", "1"),
136134
resource.TestCheckResourceAttrSet(resourceName, "target.0.db_system_id"),
137135
resource.TestCheckResourceAttr(resourceName, "target.0.target_type", "DBSYSTEM"),
@@ -220,8 +218,7 @@ func TestMysqlChannelResource_basic(t *testing.T) {
220218
{
221219
Config: config +
222220
generateDataSourceFromRepresentationMap("oci_mysql_channels", "test_channels", Optional, Update, channelDataSourceRepresentation) +
223-
compartmentIdVariableStr + ChannelResourceDependencies +
224-
generateResourceFromRepresentationMap("oci_mysql_channel", "test_channel", Optional, Update, channelRepresentation),
221+
compartmentIdVariableStr + ChannelUpdateResource,
225222
Check: resource.ComposeAggregateTestCheckFunc(
226223
resource.TestCheckResourceAttrSet(datasourceName, "channel_id"),
227224
resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
@@ -236,29 +233,23 @@ func TestMysqlChannelResource_basic(t *testing.T) {
236233
{
237234
Config: config +
238235
generateDataSourceFromRepresentationMap("oci_mysql_channel", "test_channel", Required, Create, channelSingularDataSourceRepresentation) +
239-
compartmentIdVariableStr + ChannelResourceConfig,
236+
compartmentIdVariableStr + ChannelUpdateResource,
240237
Check: resource.ComposeAggregateTestCheckFunc(
241238
resource.TestCheckResourceAttrSet(singularDatasourceName, "channel_id"),
242239
),
243240
},
244241
// remove singular datasource from previous step so that it doesn't conflict with import tests
245242
{
246-
Config: config + compartmentIdVariableStr + ChannelResourceConfig,
243+
Config: config + compartmentIdVariableStr + ChannelUpdateResource,
247244
},
248245
// verify resource import
249246
{
250247
Config: config,
251248
ImportState: true,
252249
ImportStateVerify: true,
253250
ImportStateVerifyIgnore: []string{
254-
"compartment_id",
255-
"defined_tags",
256-
"description",
257-
"display_name",
258-
"freeform_tags",
259-
"is_enabled",
260-
"source",
261-
"target",
251+
"lifecycle_details",
252+
"source.0.password",
262253
},
263254
ResourceName: resourceName,
264255
},

0 commit comments

Comments
 (0)