Skip to content

Commit 0ac855b

Browse files
Karthick GandhiMaxrovr
Karthick Gandhi
authored and
Maxrovr
committed
Added - To Support for Depracate old apps admin user creation with password
1 parent d777999 commit 0ac855b

File tree

8 files changed

+75
-45
lines changed

8 files changed

+75
-45
lines changed

‎examples/fusionapps/FusionEnvironment/fusion_environment.tf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,9 @@ resource "oci_fusion_apps_fusion_environment" "test_fusion_environment" {
9696
email_address = var.fusion_environment_create_fusion_environment_admin_user_details_email_address
9797
first_name = var.fusion_environment_create_fusion_environment_admin_user_details_first_name
9898
last_name = var.fusion_environment_create_fusion_environment_admin_user_details_last_name
99-
password = var.fusion_environment_create_fusion_environment_admin_user_details_password
10099
username = var.fusion_environment_create_fusion_environment_admin_user_details_username
100+
#Optional
101+
password = var.fusion_environment_create_fusion_environment_admin_user_details_password
101102
}
102103
display_name = var.fusion_environment_display_name
103104
fusion_environment_family_id = oci_fusion_apps_fusion_environment_family.test_fusion_environment_family.id

‎examples/fusionapps/FusionEnvironmentAdminUser/fusion_environment_admin_user.tf‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ variable "private_key_path" {}
88
variable "region" {}
99

1010
variable "fusion_environment_admin_user_email_address" {
11-
default = "JohnSmith@example.com"
11+
default = "JohnSmithnew@example.com"
1212
}
1313

1414
variable "fusion_environment_admin_user_first_name" {
@@ -40,9 +40,10 @@ resource "oci_fusion_apps_fusion_environment_admin_user" "test_fusion_environmen
4040
email_address = var.fusion_environment_admin_user_email_address
4141
first_name = var.fusion_environment_admin_user_first_name
4242
fusion_environment_id = oci_fusion_apps_fusion_environment.test_fusion_environment.id
43-
last_name = var.fusion_environment_admin_user_last_name
44-
password = var.fusion_environment_admin_user_password
43+
last_name = var.fusion_environment_admin_user_last_name
4544
username = var.fusion_environment_admin_user_username
45+
#Optional
46+
password = var.fusion_environment_admin_user_password
4647
}
4748

4849
data "oci_fusion_apps_fusion_environment_admin_users" "test_fusion_environment_admin_users" {

‎internal/integrationtest/fusion_apps_fusion_environment_admin_user_test.go‎

Lines changed: 41 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package integrationtest
66
import (
77
"context"
88
"fmt"
9+
910
"strconv"
1011
"testing"
1112

@@ -28,28 +29,29 @@ var (
2829
acctest.GenerateResourceFromRepresentationMap("oci_fusion_apps_fusion_environment_admin_user", "test_fusion_environment_admin_user", acctest.Optional, acctest.Update, FusionAppsFusionEnvironmentAdminUserRepresentation)
2930

3031
FusionAppsFusionAppsFusionEnvironmentAdminUserSingularDataSourceRepresentation = map[string]interface{}{
31-
"fusion_environment_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_fusion_apps_fusion_environment.test_fusion_environment.id}`},
32+
"fusion_environment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.environment_id}`},
3233
}
3334

3435
FusionAppsFusionAppsFusionEnvironmentAdminUserDataSourceRepresentation = map[string]interface{}{
35-
"fusion_environment_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_fusion_apps_fusion_environment.test_fusion_environment.id}`},
36+
"fusion_environment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.environment_id}`},
3637
"filter": acctest.RepresentationGroup{RepType: acctest.Required, Group: FusionAppsFusionEnvironmentAdminUserDataSourceFilterRepresentation}}
3738
FusionAppsFusionEnvironmentAdminUserDataSourceFilterRepresentation = map[string]interface{}{
3839
"name": acctest.Representation{RepType: acctest.Required, Create: `id`},
3940
"values": acctest.Representation{RepType: acctest.Required, Create: []string{`${oci_fusion_apps_fusion_environment_admin_user.test_fusion_environment_admin_user.id}`}},
4041
}
4142

4243
FusionAppsFusionEnvironmentAdminUserRepresentation = map[string]interface{}{
43-
"email_address": acctest.Representation{RepType: acctest.Required, Create: `JohnSmith@example.com`},
44-
"first_name": acctest.Representation{RepType: acctest.Required, Create: `firstName`},
45-
"fusion_environment_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_fusion_apps_fusion_environment.test_fusion_environment.id}`},
46-
"last_name": acctest.Representation{RepType: acctest.Required, Create: `lastName`},
47-
"password": acctest.Representation{RepType: acctest.Required, Create: `BEstrO0ng_#11`},
44+
"email_address": acctest.Representation{RepType: acctest.Required, Create: `JohnSmithnew@example.com`},
45+
"first_name": acctest.Representation{RepType: acctest.Required, Create: `firstNamenew`},
46+
"fusion_environment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.environment_id}`},
47+
"last_name": acctest.Representation{RepType: acctest.Required, Create: `lastNamenew`},
48+
"password": acctest.Representation{RepType: acctest.Optional, Create: `BEstrO0ng_#11`},
4849
"username": acctest.Representation{RepType: acctest.Required, Create: `terraformTest`},
4950
}
5051

51-
FusionAppsFusionEnvironmentAdminUserResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_fusion_apps_fusion_environment_family", "test_fusion_environment_family", acctest.Required, acctest.Create, FusionAppsFusionEnvironmentFamilyRepresentation) +
52-
acctest.GenerateResourceFromRepresentationMap("oci_fusion_apps_fusion_environment", "test_fusion_environment", acctest.Required, acctest.Create, FusionAppsFusionEnvironmentRepresentation)
52+
//FusionAppsFusionEnvironmentAdminUserResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_fusion_apps_fusion_environment_family", "test_fusion_environment_family", acctest.Required, acctest.Create, FusionAppsFusionEnvironmentFamilyRepresentation) +
53+
// acctest.GenerateResourceFromRepresentationMap("oci_fusion_apps_fusion_environment", "test_fusion_environment", acctest.Required, acctest.Create, FusionAppsFusionEnvironmentRepresentation)
54+
FusionAppsFusionEnvironmentAdminUserResourceDependencies = ""
5355
)
5456

5557
// issue-routing-tag: fusion_apps/default
@@ -62,25 +64,46 @@ func TestFusionAppsFusionEnvironmentAdminUserResource_basic(t *testing.T) {
6264
compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
6365
compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
6466

67+
fusionEnvironmentId := utils.GetEnvSettingWithBlankDefault("environment_ocid")
68+
fusionEnvIdVariableStr := fmt.Sprintf("variable \"environment_id\" { default = \"%s\" }\n", fusionEnvironmentId)
69+
6570
resourceName := "oci_fusion_apps_fusion_environment_admin_user.test_fusion_environment_admin_user"
6671
datasourceName := "data.oci_fusion_apps_fusion_environment_admin_users.test_fusion_environment_admin_users"
6772
singularDatasourceName := "data.oci_fusion_apps_fusion_environment_admin_user.test_fusion_environment_admin_user"
6873

6974
var resId string
70-
// Save TF content to Create resource with only required properties. This has to be exactly the same as the config part in the create step in the test.
71-
acctest.SaveConfigContent(config+compartmentIdVariableStr+FusionAppsFusionEnvironmentAdminUserResourceDependencies+
72-
acctest.GenerateResourceFromRepresentationMap("oci_fusion_apps_fusion_environment_admin_user", "test_fusion_environment_admin_user", acctest.Required, acctest.Create, FusionAppsFusionEnvironmentAdminUserRepresentation), "fusionapps", "fusionEnvironmentAdminUser", t)
75+
// Save TF content to Create resource with optional properties. This has to be exactly the same as the config part in the "create with optionals" step in the test.
76+
acctest.SaveConfigContent(config+compartmentIdVariableStr+fusionEnvIdVariableStr+FusionAppsFusionEnvironmentAdminUserResourceDependencies+
77+
acctest.GenerateResourceFromRepresentationMap("oci_fusion_apps_fusion_environment_admin_user", "test_fusion_environment_admin_user", acctest.Optional, acctest.Create, FusionAppsFusionEnvironmentAdminUserRepresentation), "fusionapps", "fusionEnvironmentAdminUser", t)
7378

7479
acctest.ResourceTest(t, testAccCheckFusionAppsFusionEnvironmentAdminUserDestroy, []resource.TestStep{
7580
// verify Create
7681
{
77-
Config: config + compartmentIdVariableStr + FusionAppsFusionEnvironmentAdminUserResourceDependencies +
82+
Config: config + compartmentIdVariableStr + fusionEnvIdVariableStr + FusionAppsFusionEnvironmentAdminUserResourceDependencies +
7883
acctest.GenerateResourceFromRepresentationMap("oci_fusion_apps_fusion_environment_admin_user", "test_fusion_environment_admin_user", acctest.Required, acctest.Create, FusionAppsFusionEnvironmentAdminUserRepresentation),
7984
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
80-
resource.TestCheckResourceAttr(resourceName, "email_address", "[email protected]"),
81-
resource.TestCheckResourceAttr(resourceName, "first_name", "firstName"),
85+
resource.TestCheckResourceAttr(resourceName, "email_address", "[email protected]"),
86+
resource.TestCheckResourceAttr(resourceName, "first_name", "firstNamenew"),
87+
resource.TestCheckResourceAttrSet(resourceName, "fusion_environment_id"),
88+
resource.TestCheckResourceAttr(resourceName, "last_name", "lastNamenew"),
89+
resource.TestCheckResourceAttr(resourceName, "username", "terraformTest"),
90+
),
91+
},
92+
93+
// delete before next Create
94+
{
95+
Config: config + compartmentIdVariableStr + fusionEnvIdVariableStr + FusionAppsFusionEnvironmentAdminUserResourceDependencies,
96+
},
97+
// verify Create with optionals
98+
{
99+
Config: config + compartmentIdVariableStr + fusionEnvIdVariableStr + FusionAppsFusionEnvironmentAdminUserResourceDependencies +
100+
acctest.GenerateResourceFromRepresentationMap("oci_fusion_apps_fusion_environment_admin_user", "test_fusion_environment_admin_user", acctest.Optional, acctest.Create, FusionAppsFusionEnvironmentAdminUserRepresentation),
101+
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
102+
resource.TestCheckResourceAttr(resourceName, "email_address", "[email protected]"),
103+
resource.TestCheckResourceAttr(resourceName, "first_name", "firstNamenew"),
82104
resource.TestCheckResourceAttrSet(resourceName, "fusion_environment_id"),
83-
resource.TestCheckResourceAttr(resourceName, "last_name", "lastName"),
105+
resource.TestCheckResourceAttr(resourceName, "items.#", "2"),
106+
resource.TestCheckResourceAttr(resourceName, "last_name", "lastNamenew"),
84107
resource.TestCheckResourceAttr(resourceName, "password", "BEstrO0ng_#11"),
85108
resource.TestCheckResourceAttr(resourceName, "username", "terraformTest"),
86109

@@ -100,7 +123,7 @@ func TestFusionAppsFusionEnvironmentAdminUserResource_basic(t *testing.T) {
100123
{
101124
Config: config +
102125
acctest.GenerateDataSourceFromRepresentationMap("oci_fusion_apps_fusion_environment_admin_users", "test_fusion_environment_admin_users", acctest.Optional, acctest.Update, FusionAppsFusionAppsFusionEnvironmentAdminUserDataSourceRepresentation) +
103-
compartmentIdVariableStr + FusionAppsFusionEnvironmentAdminUserResourceDependencies +
126+
compartmentIdVariableStr + fusionEnvIdVariableStr + FusionAppsFusionEnvironmentAdminUserResourceDependencies +
104127
acctest.GenerateResourceFromRepresentationMap("oci_fusion_apps_fusion_environment_admin_user", "test_fusion_environment_admin_user", acctest.Optional, acctest.Update, FusionAppsFusionEnvironmentAdminUserRepresentation),
105128
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
106129
resource.TestCheckResourceAttrSet(datasourceName, "fusion_environment_id"),
@@ -113,10 +136,9 @@ func TestFusionAppsFusionEnvironmentAdminUserResource_basic(t *testing.T) {
113136
{
114137
Config: config +
115138
acctest.GenerateDataSourceFromRepresentationMap("oci_fusion_apps_fusion_environment_admin_user", "test_fusion_environment_admin_user", acctest.Required, acctest.Create, FusionAppsFusionAppsFusionEnvironmentAdminUserSingularDataSourceRepresentation) +
116-
compartmentIdVariableStr + FusionAppsFusionEnvironmentAdminUserResourceConfig,
139+
compartmentIdVariableStr + fusionEnvIdVariableStr + FusionAppsFusionEnvironmentAdminUserResourceConfig,
117140
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
118141
resource.TestCheckResourceAttrSet(singularDatasourceName, "fusion_environment_id"),
119-
120142
resource.TestCheckResourceAttr(singularDatasourceName, "items.#", "2"),
121143
),
122144
},

‎internal/integrationtest/fusion_apps_fusion_environment_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ var (
106106
"email_address": acctest.Representation{RepType: acctest.Required, Create: `[email protected]`},
107107
"first_name": acctest.Representation{RepType: acctest.Required, Create: `firstName`},
108108
"last_name": acctest.Representation{RepType: acctest.Required, Create: `lastName`},
109-
"password": acctest.Representation{RepType: acctest.Required, Create: `BEstrO0ng_#11`},
110-
"username": acctest.Representation{RepType: acctest.Required, Create: `username_test`},
109+
"username": acctest.Representation{RepType: acctest.Required, Create: `terraformTestCreate`},
110+
"password": acctest.Representation{RepType: acctest.Optional, Create: `BEstrO0ng_#11`},
111111
}
112112
FusionAppsFusionEnvironmentMaintenancePolicyRepresentation = map[string]interface{}{
113113
"environment_maintenance_override": acctest.Representation{RepType: acctest.Optional, Create: `PROD`, Update: `NON_PROD`},
@@ -194,7 +194,7 @@ func TestFusionAppsFusionEnvironmentResource_basic(t *testing.T) {
194194
resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.first_name", "firstName"),
195195
resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.last_name", "lastName"),
196196
resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.password", "BEstrO0ng_#11"),
197-
resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.username", "username_test"),
197+
resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.username", "terraformTestCreate"),
198198
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
199199
resource.TestCheckResourceAttr(resourceName, "dns_prefix", "dnsPrefix"),
200200
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
@@ -240,7 +240,7 @@ func TestFusionAppsFusionEnvironmentResource_basic(t *testing.T) {
240240
resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.first_name", "firstName"),
241241
resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.last_name", "lastName"),
242242
resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.password", "BEstrO0ng_#11"),
243-
resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.username", "username_test"),
243+
resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.username", "terraformTestCreate"),
244244
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
245245
resource.TestCheckResourceAttr(resourceName, "dns_prefix", "dnsPrefix"),
246246
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
@@ -280,8 +280,8 @@ func TestFusionAppsFusionEnvironmentResource_basic(t *testing.T) {
280280
resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.email_address", "[email protected]"),
281281
resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.first_name", "firstName"),
282282
resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.last_name", "lastName"),
283-
resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.password", "BEstrO0ng_#11"),
284-
resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.username", "username_test"),
283+
//resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.password", "BEstrO0ng_#11"),
284+
resource.TestCheckResourceAttr(resourceName, "create_fusion_environment_admin_user_details.0.username", "terraformTestCreate"),
285285
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"),
286286
resource.TestCheckResourceAttr(resourceName, "dns_prefix", "dnsPrefix"),
287287
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),

‎internal/service/fusion_apps/fusion_apps_fusion_environment_admin_user_resource.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,20 @@ func FusionAppsFusionEnvironmentAdminUserResource() *schema.Resource {
5353
Required: true,
5454
ForceNew: true,
5555
},
56-
"password": {
57-
Type: schema.TypeString,
58-
Required: true,
59-
ForceNew: true,
60-
Sensitive: true,
61-
},
6256
"username": {
6357
Type: schema.TypeString,
6458
Required: true,
6559
ForceNew: true,
6660
},
6761

6862
// Optional
63+
"password": {
64+
Type: schema.TypeString,
65+
Optional: true,
66+
Computed: true,
67+
ForceNew: true,
68+
Sensitive: true,
69+
},
6970

7071
// Computed
7172
"items": {

‎internal/service/fusion_apps/fusion_apps_fusion_environment_resource.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,20 @@ func FusionAppsFusionEnvironmentResource() *schema.Resource {
6565
Required: true,
6666
ForceNew: true,
6767
},
68-
"password": {
69-
Type: schema.TypeString,
70-
Required: true,
71-
ForceNew: true,
72-
Sensitive: true,
73-
},
7468
"username": {
7569
Type: schema.TypeString,
7670
Required: true,
7771
ForceNew: true,
7872
},
7973

8074
// Optional
75+
"password": {
76+
Type: schema.TypeString,
77+
Optional: true,
78+
Computed: true,
79+
ForceNew: true,
80+
Sensitive: true,
81+
},
8182

8283
// Computed
8384
},

‎website/docs/r/fusion_apps_fusion_environment.html.markdown‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ resource "oci_fusion_apps_fusion_environment" "test_fusion_environment" {
2424
email_address = var.fusion_environment_create_fusion_environment_admin_user_details_email_address
2525
first_name = var.fusion_environment_create_fusion_environment_admin_user_details_first_name
2626
last_name = var.fusion_environment_create_fusion_environment_admin_user_details_last_name
27-
password = var.fusion_environment_create_fusion_environment_admin_user_details_password
2827
username = var.fusion_environment_create_fusion_environment_admin_user_details_username
28+
29+
#Optional
30+
password = var.fusion_environment_create_fusion_environment_admin_user_details_password
2931
}
3032
display_name = var.fusion_environment_display_name
3133
fusion_environment_family_id = oci_fusion_apps_fusion_environment_family.test_fusion_environment_family.id
@@ -68,7 +70,7 @@ The following arguments are supported:
6870
* `email_address` - (Required) The email address for the administrator.
6971
* `first_name` - (Required) The administrator's first name.
7072
* `last_name` - (Required) The administrator's last name.
71-
* `password` - (Required) The password for the administrator.
73+
* `password` - (Optional) The password for the administrator.
7274
* `username` - (Required) The username for the administrator.
7375
* `defined_tags` - (Optional) (Updatable) Defined tags for this resource. Each key is predefined and scoped to a namespace. Example: `{"foo-namespace.bar-key": "value"}`
7476
* `display_name` - (Required) (Updatable) FusionEnvironment Identifier can be renamed.

‎website/docs/r/fusion_apps_fusion_environment_admin_user.html.markdown‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ resource "oci_fusion_apps_fusion_environment_admin_user" "test_fusion_environmen
2121
first_name = var.fusion_environment_admin_user_first_name
2222
fusion_environment_id = oci_fusion_apps_fusion_environment.test_fusion_environment.id
2323
last_name = var.fusion_environment_admin_user_last_name
24-
password = var.fusion_environment_admin_user_password
2524
username = var.fusion_environment_admin_user_username
25+
26+
#Optional
27+
password = var.fusion_environment_admin_user_password
2628
}
2729
```
2830

@@ -34,7 +36,7 @@ The following arguments are supported:
3436
* `first_name` - (Required) The administrator's first name.
3537
* `fusion_environment_id` - (Required) unique FusionEnvironment identifier
3638
* `last_name` - (Required) The administrator's last name.
37-
* `password` - (Required) The password for the administrator.
39+
* `password` - (Optional) The password for the administrator.
3840
* `username` - (Required) The username for the administrator.
3941

4042

0 commit comments

Comments
 (0)