Skip to content

Commit

Permalink
Merge pull request #84 from delphix-integrations/develop
Browse files Browse the repository at this point in the history
ESCL-4868 | Release Version 3.2.1 | Develop -> Main
  • Loading branch information
elima-sugunan authored Mar 26, 2024
2 parents accc00f + b0b3872 commit f8dd53d
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Visit https://goreleaser.com for documentation on how to customize this
# behavior.
env:
- PROVIDER_VERSION=3.2.0
- PROVIDER_VERSION=3.2.1
before:
hooks:
# this is just an example and not a requirement for provider building/publishing
Expand Down
2 changes: 1 addition & 1 deletion GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ HOSTNAME=delphix.com
NAMESPACE=dct
NAME=delphix
BINARY=terraform-provider-${NAME}
VERSION=3.2.0
VERSION=3.2.1
OS_ARCH=darwin_amd64

default: install
Expand Down
7 changes: 5 additions & 2 deletions docs/resources/appdata_dsource.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ The Appdata dSource resource allows Terraform to create and delete AppData dSour
## System Requirements

* Data Control Tower v10.0.1+ is required for dSource management. Lower versions are not supported.
* This Appdata dSource Resource only supports Appdata based datasources , such as POSTGRES,SAP HANA, IBM Db2, etc.The below examples are shown from the PostgreSQL context. See the Oracle dSource Resource for the support of Oracle. The Delphix Provider does not support Oracle, SQL Server, or SAP ASE.
* This Appdata dSource Resource only supports Appdata based datasource's , such as POSTGRES,SAP HANA, IBM Db2, etc.The below examples are shown from the PostgreSQL context. See the Oracle dSource Resource for the support of Oracle. The Delphix Provider does not support Oracle, SQL Server, or SAP ASE.

## Upgrade Guide
* Any new dSource created post Version>=3.2.1 can set `wait_time` to wait for snapshot creation , dSources created prior to this version will not support this capability

## Example Usage

Expand Down Expand Up @@ -183,4 +186,4 @@ resource "delphix_appdata_dsource" "dsource_name" {

* `skip_wait_for_snapshot_creation` - (Optional) By default this resource will wait for a snapshot to be created post-dSource creation. This ensure a snapshot is available during the VDB provisioning. This behavior can be skipped by setting this parameter to `true`.

* `wait_time` - (Optional) By default this resource waits 3 minutes for a snapshot to be created. Increase the integer value as needed for larger dSource snapshots. This parameter can be ignored if 'skip_wait_for_snapshot_creation' is set to `true`.
* `wait_time` - (Optional) By default this resource waits 0 minutes for a snapshot to be created. Increase the integer value as needed for larger dSource snapshots. This parameter can be ignored if 'skip_wait_for_snapshot_creation' is set to `true`.
2 changes: 1 addition & 1 deletion docs/resources/oracle_dsource.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,4 +197,4 @@ resource "delphix_oracle_dsource" "test_oracle_dsource" {

* `skip_wait_for_snapshot_creation` - (Optional) By default this resource will wait for a snapshot to be created post-dSource creation. This ensure a snapshot is available during the VDB provisioning. This behavior can be skipped by setting this parameter to `true`.

* `wait_time` - (Optional) By default this resource waits 3 minutes for a snapshot to be created. Increase the integer value as needed for larger dSource snapshots. This parameter can be ignored if 'skip_wait_for_snapshot_creation' is set to `true`.
* `wait_time` - (Optional) By default this resource waits 0 minutes for a snapshot to be created. Increase the integer value as needed for larger dSource snapshots. This parameter can be ignored if 'skip_wait_for_snapshot_creation' is set to `true`.
2 changes: 1 addition & 1 deletion internal/provider/resource_appdata_dsource.go
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ func resourceAppdataDsource() *schema.Resource {
},
"wait_time": {
Type: schema.TypeInt,
Default: 3,
Default: 0,
Optional: true,
},
"skip_wait_for_snapshot_creation": {
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/resource_oracle_dsource.go
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ func resourceOracleDsource() *schema.Resource {
},
"wait_time": {
Type: schema.TypeInt,
Default: 3,
Default: 0,
Optional: true,
},
"skip_wait_for_snapshot_creation": {
Expand Down
10 changes: 5 additions & 5 deletions internal/provider/resource_vdb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ func testAccCheckDctVDBBookmarkConfigBasic() string {
vdb_req := client.VDBsApi.ProvisionVdbBySnapshot(context.Background())

vdb_res, vdb_http_res, vdb_err := vdb_req.ProvisionVDBBySnapshotParameters(*provisionVDBBySnapshotParameters).Execute()
if diags := apiErrorResponseHelper(vdb_res, vdb_http_res, vdb_err); diags != nil {
println("An error occured during vdb creation: " + vdb_err.Error())
if diags := apiErrorResponseHelper(context.Background(), vdb_res, vdb_http_res, vdb_err); diags != nil {
println("An error occurred during vdb creation: " + vdb_err.Error())
return "" // return empty config to indicate config error
}
vdb_id = *vdb_res.VdbId
Expand All @@ -163,8 +163,8 @@ func testAccCheckDctVDBBookmarkConfigBasic() string {
bookmark_req := client.BookmarksApi.CreateBookmark(context.Background()).BookmarkCreateParameters(*bookmark)
bk_res, bk_http_res, bk_err := bookmark_req.Execute()

if diags := apiErrorResponseHelper(bk_res, bk_http_res, bk_err); diags != nil {
println("An error occured during bookmark creation: " + bk_err.Error())
if diags := apiErrorResponseHelper(context.Background(), bk_res, bk_http_res, bk_err); diags != nil {
println("An error occurred during bookmark creation: " + bk_err.Error())
return ""
}
bookmark_id = *bk_res.Bookmark.Id
Expand All @@ -173,7 +173,7 @@ func testAccCheckDctVDBBookmarkConfigBasic() string {
bk_job_res, bk_job_err := PollJobStatus(*bk_res.Job.Id, context.Background(), client)

if bk_job_res == Failed || bk_job_res == Canceled || bk_job_res == Abandoned {
println("An error occured during bookmark job polling: " + bk_job_err)
println("An error occurred during bookmark job polling: " + bk_job_err)
return "" // return empty config to indicate config error
}

Expand Down

0 comments on commit f8dd53d

Please sign in to comment.