Skip to content

Commit 6af42e9

Browse files
Uddipaan-HazarikaUddipaan-Hazarika
committed
HUBS-1559 | Postgres support
1 parent 1e26f16 commit 6af42e9

File tree

5 files changed

+53
-11
lines changed

5 files changed

+53
-11
lines changed

‎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=1.0.1
6+
VERSION=2.0.0-beta
77
OS_ARCH=darwin_amd64
88

99
default: install

‎go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module terraform-provider-delphix
33
go 1.17
44

55
require (
6-
github.com/delphix/dct-sdk-go v1.2.0
6+
github.com/delphix/dct-sdk-go v1.6.0
77
github.com/hashicorp/terraform-plugin-sdk v1.17.2
88
)
99

@@ -46,7 +46,6 @@ require (
4646
github.com/vmihailenco/tagparser v0.1.1 // indirect
4747
github.com/zclconf/go-cty v1.10.0 // indirect
4848
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect
49-
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 // indirect
5049
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
5150
golang.org/x/text v0.3.7 // indirect
5251
google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d // indirect

‎go.sum‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
8585
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
8686
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
8787
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
88-
github.com/delphix/dct-sdk-go v1.2.0 h1:/YM+CjuXv1cx3xBDYGk1ST3QcAG4EAF5ty96elnnh+M=
89-
github.com/delphix/dct-sdk-go v1.2.0/go.mod h1:jHmLaVSOGroT5E298s7GU3TobaZ8SH0RqUhFo5WkPqo=
88+
github.com/delphix/dct-sdk-go v1.6.0 h1:mlt+fNX7PwF1fnV9W1lbMP+qW1LPb2UBHBrrvCtiOTQ=
89+
github.com/delphix/dct-sdk-go v1.6.0/go.mod h1:7mGbpjf2LNaBuyeblpbUF9K/VPWoym//HZlK5vGo3TI=
9090
github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
9191
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
9292
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -336,13 +336,18 @@ github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
336336
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
337337
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
338338
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
339+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
340+
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
339341
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
340342
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
341343
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
342344
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
343345
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
344-
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
345346
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
347+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
348+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
349+
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
350+
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
346351
github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
347352
github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
348353
github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
@@ -458,8 +463,6 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr
458463
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
459464
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
460465
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
461-
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 h1:+jnHzr9VPj32ykQVai5DNahi9+NSp7yYuCsl5eAQtL0=
462-
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
463466
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
464467
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
465468
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -675,8 +678,9 @@ gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
675678
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
676679
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
677680
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
678-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
679681
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
682+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
683+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
680684
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
681685
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
682686
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

‎internal/provider/resource_vdb.go‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package provider
22

33
import (
44
"context"
5+
"encoding/json"
56
"net/http"
67
"time"
78

@@ -567,6 +568,14 @@ func resourceVdb() *schema.Resource {
567568
},
568569
},
569570
},
571+
"appdata_source_params": {
572+
Type: schema.TypeString,
573+
Optional: true,
574+
},
575+
"appdata_config_params": {
576+
Type: schema.TypeString,
577+
Optional: true,
578+
},
570579
},
571580
}
572581
}
@@ -766,6 +775,16 @@ func helper_provision_by_snapshot(ctx context.Context, d *schema.ResourceData, m
766775
if v, has_v := d.GetOk("tags"); has_v {
767776
provisionVDBBySnapshotParameters.SetTags(toTagArray(v))
768777
}
778+
if v, has_v := d.GetOk("appdata_source_params"); has_v {
779+
appdata_source_params := make(map[string]interface{})
780+
json.Unmarshal([]byte(v.(string)), &appdata_source_params)
781+
provisionVDBBySnapshotParameters.SetAppdataSourceParams(appdata_source_params)
782+
}
783+
if v, has_v := d.GetOk("appdata_config_params"); has_v {
784+
appdata_config_params := make(map[string]interface{})
785+
json.Unmarshal([]byte(v.(string)), &appdata_config_params)
786+
provisionVDBBySnapshotParameters.SetAppdataConfigParams(appdata_config_params)
787+
}
769788

770789
req := client.VDBsApi.ProvisionVdbBySnapshot(ctx)
771790

@@ -963,6 +982,16 @@ func helper_provision_by_timestamp(ctx context.Context, d *schema.ResourceData,
963982
if v, has_v := d.GetOk("tags"); has_v {
964983
provisionVDBByTimestampParameters.SetTags(toTagArray(v))
965984
}
985+
if v, has_v := d.GetOk("appdata_source_params"); has_v {
986+
appdata_source_params := make(map[string]interface{})
987+
json.Unmarshal([]byte(v.(string)), &appdata_source_params)
988+
provisionVDBByTimestampParameters.SetAppdataSourceParams(appdata_source_params)
989+
}
990+
if v, has_v := d.GetOk("appdata_config_params"); has_v {
991+
appdata_config_params := make(map[string]interface{})
992+
json.Unmarshal([]byte(v.(string)), &appdata_config_params)
993+
provisionVDBByTimestampParameters.SetAppdataConfigParams(appdata_config_params)
994+
}
966995

967996
req := client.VDBsApi.ProvisionVdbByTimestamp(ctx)
968997

@@ -1145,6 +1174,16 @@ func helper_provision_by_bookmark(ctx context.Context, d *schema.ResourceData, m
11451174
if v, has_v := d.GetOk("tags"); has_v {
11461175
provisionVDBFromBookmarkParameters.SetPostStop(toHookArray(v))
11471176
}
1177+
if v, has_v := d.GetOk("appdata_source_params"); has_v {
1178+
appdata_source_params := make(map[string]interface{})
1179+
json.Unmarshal([]byte(v.(string)), &appdata_source_params)
1180+
provisionVDBFromBookmarkParameters.SetAppdataSourceParams(appdata_source_params)
1181+
}
1182+
if v, has_v := d.GetOk("appdata_config_params"); has_v {
1183+
appdata_config_params := make(map[string]interface{})
1184+
json.Unmarshal([]byte(v.(string)), &appdata_config_params)
1185+
provisionVDBFromBookmarkParameters.SetAppdataConfigParams(appdata_config_params)
1186+
}
11481187

11491188
req := client.VDBsApi.ProvisionVdbFromBookmark(ctx)
11501189

‎internal/provider/resource_vdb_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ func testAccCheckDctVDBBookmarkConfigBasic() string {
113113
}
114114

115115
//create bookmark
116-
bookmark := dctapi.NewBookmarkWithDefaults()
116+
bookmark := dctapi.NewBookmarkCreateParametersWithDefaults()
117117
bookmark.SetVdbIds([]string{vdb_id})
118118
bookmark.SetName(acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
119119

120-
bookmark_req := client.BookmarksApi.CreateBookmark(context.Background()).Bookmark(*bookmark)
120+
bookmark_req := client.BookmarksApi.CreateBookmark(context.Background()).BookmarkCreateParameters(*bookmark)
121121
bk_res, bk_http_res, bk_err := bookmark_req.Execute()
122122

123123
if diags := apiErrorResponseHelper(bk_res, bk_http_res, bk_err); diags != nil {

0 commit comments

Comments
 (0)