Skip to content

Commit 0cce3f2

Browse files
author
Uddipaan Hazarika
committed
added logic to update env and acc tests
1 parent 6cbb64b commit 0cce3f2

File tree

8 files changed

+872
-133
lines changed

8 files changed

+872
-133
lines changed

.whitesource

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
{
2-
"scanSettings": {
3-
"configMode": "AUTO",
4-
"configExternalURL": "",
5-
"projectToken": "",
6-
"enableLicenseViolations": "true",
7-
"displayLicenseViolations": "true",
8-
"enableIaC": "true",
9-
"baseBranches": []
10-
},
11-
"scanSettingsSAST": {
12-
"enableScan": true,
13-
"scanPullRequests": true,
14-
"incrementalScan": true,
15-
"baseBranches": [],
16-
"snippetSize": 10
17-
},
18-
"checkRunSettings": {
19-
"vulnerableCheckRunConclusionLevel": "failure",
20-
"displayMode": "diff",
21-
"useMendCheckNames": true
22-
},
23-
"checkRunSettingsSAST": {
24-
"checkRunConclusionLevel": "failure",
25-
"severityThreshold": "high"
26-
},
27-
"issueSettings": {
28-
"minSeverityLevel": "LOW",
29-
"issueType": "DEPENDENCY"
30-
},
31-
"issueSettingsSAST": {
32-
"minSeverityLevel": "high",
33-
"issueType": "repo"
34-
},
35-
"remediateSettings": {
36-
"workflowRules": {
37-
"enabled": true
38-
}
39-
},
40-
"imageSettings":{
41-
"imageTracing":{
42-
"enableImageTracingPR": false,
43-
"addRepositoryCoordinate": false,
44-
"addDockerfilePath": false,
45-
"addMendIdentifier": false
46-
}
2+
"scanSettings": {
3+
"configMode": "AUTO",
4+
"configExternalURL": "",
5+
"projectToken": "",
6+
"enableLicenseViolations": "true",
7+
"displayLicenseViolations": "true",
8+
"enableIaC": "true",
9+
"baseBranches": []
10+
},
11+
"scanSettingsSAST": {
12+
"enableScan": true,
13+
"scanPullRequests": true,
14+
"incrementalScan": true,
15+
"baseBranches": [],
16+
"snippetSize": 10
17+
},
18+
"checkRunSettings": {
19+
"vulnerableCheckRunConclusionLevel": "failure",
20+
"displayMode": "diff",
21+
"useMendCheckNames": true
22+
},
23+
"checkRunSettingsSAST": {
24+
"checkRunConclusionLevel": "failure",
25+
"severityThreshold": "high"
26+
},
27+
"issueSettings": {
28+
"minSeverityLevel": "LOW",
29+
"issueType": "DEPENDENCY"
30+
},
31+
"issueSettingsSAST": {
32+
"minSeverityLevel": "high",
33+
"issueType": "repo"
34+
},
35+
"remediateSettings": {
36+
"workflowRules": {
37+
"enabled": true
4738
}
39+
},
40+
"imageSettings":{
41+
"imageTracing":{
42+
"enableImageTracingPR": false,
43+
"addRepositoryCoordinate": false,
44+
"addDockerfilePath": false,
45+
"addMendIdentifier": false
46+
}
47+
}
4848
}

GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ HOSTNAME=delphix.com
33
NAMESPACE=dct
44
NAME=delphix
55
BINARY=terraform-provider-${NAME}
6-
VERSION=3.3.0
6+
VERSION=4.0.0
77
OS_ARCH=darwin_arm64
88

99
default: install

go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module terraform-provider-delphix
22

3-
go 1.22.0
3+
go 1.23.0
44

5-
toolchain go1.22.6
5+
toolchain go1.23.7
66

77
require (
8-
github.com/delphix/dct-sdk-go/v25 v25.1.2
8+
github.com/delphix/dct-sdk-go/v25 v25.2.0
99
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
1010
)
1111

@@ -47,10 +47,10 @@ require (
4747
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
4848
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
4949
github.com/zclconf/go-cty v1.14.2 // indirect
50-
golang.org/x/crypto v0.31.0 // indirect
50+
golang.org/x/crypto v0.35.0 // indirect
5151
golang.org/x/mod v0.17.0 // indirect
52-
golang.org/x/sys v0.28.0 // indirect
53-
golang.org/x/text v0.21.0 // indirect
52+
golang.org/x/sys v0.30.0 // indirect
53+
golang.org/x/text v0.22.0 // indirect
5454
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
5555
google.golang.org/grpc v1.61.1 // indirect
5656
)
@@ -59,7 +59,7 @@ require (
5959
github.com/golang/protobuf v1.5.3 // indirect
6060
github.com/kr/pretty v0.2.1 // indirect
6161
github.com/kr/text v0.2.0 // indirect
62-
golang.org/x/net v0.33.0 // indirect
62+
golang.org/x/net v0.36.0 // indirect
6363
google.golang.org/appengine v1.6.8 // indirect
6464
google.golang.org/protobuf v1.33.0 // indirect
6565
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect

go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG
1919
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2020
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2121
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
22-
github.com/delphix/dct-sdk-go/v25 v25.1.2 h1:wiJui4cZB4xK9Znu9JdWb5N3rKqbnz1oXWaqLXjGHnE=
23-
github.com/delphix/dct-sdk-go/v25 v25.1.2/go.mod h1:Y//bIbAZP6SZhLLZAQMxEfeRXvsvKQwu/kSR8a5hfqc=
22+
github.com/delphix/dct-sdk-go/v25 v25.2.0 h1:djFGvJwDHE99vBFa5ZlixcV49niz7nRsuwfue8l/AQA=
23+
github.com/delphix/dct-sdk-go/v25 v25.2.0/go.mod h1:fCw+bOFPHiNcqUGvRpOEq4PINgcmw6KptstJy4v66Uo=
2424
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
2525
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
2626
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
@@ -148,22 +148,22 @@ github.com/zclconf/go-cty v1.14.2 h1:kTG7lqmBou0Zkx35r6HJHUQTvaRPr5bIAf3AoHS0izI
148148
github.com/zclconf/go-cty v1.14.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
149149
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
150150
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
151-
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
152-
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
151+
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
152+
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
153153
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
154154
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
155155
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
156156
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
157157
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
158158
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
159159
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
160-
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
161-
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
160+
golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
161+
golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
162162
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
163163
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
164164
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
165-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
166-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
165+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
166+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
167167
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
168168
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
169169
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -176,19 +176,19 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
176176
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
177177
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
178178
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
179-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
180-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
179+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
180+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
181181
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
182182
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
183-
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
184-
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
183+
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
184+
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
185185
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
186186
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
187187
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
188188
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
189189
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
190-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
191-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
190+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
191+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
192192
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
193193
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
194194
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

internal/provider/commons.go

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,49 @@ var updatableOracleDsourceKeys = map[string]bool{
110110
"ops_pre_log_sync": true,
111111
"ops_post_sync": true,
112112
}
113+
114+
var updatableEnvKeys = map[string]bool{
115+
"name": true,
116+
"cluster_home": true,
117+
"connector_port": true,
118+
"username": true,
119+
"password": true,
120+
"description": true,
121+
"allow_provisioning": true,
122+
"is_staging": true,
123+
"version": true,
124+
"oracle_base": true,
125+
"bits": true,
126+
"tags": true,
127+
"hosts": true,
128+
// "java_home": true,
129+
// "hostname": true,
130+
// "ssh_port": true,
131+
// "toolkit_path": true,
132+
// "nfs_addresses": true,
133+
// "oracle_tde_keystores_root_path": true,
134+
135+
}
136+
137+
var isDestructiveEnvUpdate = map[string]bool{
138+
"name": false,
139+
"cluster_home": true,
140+
"connector_port": true,
141+
"username": true,
142+
"password": true,
143+
"description": false,
144+
"allow_provisioning": false,
145+
"is_staging": false,
146+
"version": false,
147+
"oracle_base": false,
148+
"bits": false,
149+
"tags": false,
150+
"hosts": true,
151+
// "java_home": false,
152+
// "hostname": true,
153+
// "ssh_port": true,
154+
// "toolkit_path": true,
155+
// "nfs_addresses": true,
156+
// "oracle_tde_keystores_root_path": true,
157+
158+
}

0 commit comments

Comments
 (0)