Terraform Provider updates for Opensearch #1140

bhardwajRahul · 2024-04-16T10:10:05Z

This PR aims at adding support for Opensearch in Terraform Provider.

gitguardian · 2024-04-16T10:10:41Z

️✅ There are no secrets present in this pull request anymore.

If these secrets were true positive and are still valid, we highly recommend you to revoke them.
Once a secret has been leaked into a git repository, you should consider it compromised, even if it was deleted immediately.
Find here more information about risks.

^{_{🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.}}

andrewsomething

Can we limit the dependency updates to what is strictly required for the change?

bhardwajRahul · 2024-04-16T15:27:38Z

Can we limit the dependency updates to what is strictly required for the change?

I think here we are doing a major godo version upgrade i.e. from 109 -> 113 and it is bringing along a lot of vendor/other dependencies with it.

andrewsomething · 2024-04-16T15:57:52Z

@bhardwajRahul Most of these changes do not seem to be coming from the godo update. On main:

asb@asb-do-laptop:~/projects/terraform-provider-digitalocean$ git checkout main
Already on 'main'
Your branch is up to date with 'origin/main'.
asb@asb-do-laptop:~/projects/terraform-provider-digitalocean$ go get github.com/digitalocean/godo@v1.113.0
go: upgraded github.com/digitalocean/godo v1.109.1-0.20240228180303-16a4709be517 => v1.113.0
asb@asb-do-laptop:~/projects/terraform-provider-digitalocean$ go mod vendor
asb@asb-do-laptop:~/projects/terraform-provider-digitalocean$ go mod tidy
asb@asb-do-laptop:~/projects/terraform-provider-digitalocean$ git st
On branch main
Your branch is up to date with 'origin/main'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   go.mod
	modified:   go.sum
	modified:   vendor/github.com/digitalocean/godo/CHANGELOG.md
	modified:   vendor/github.com/digitalocean/godo/databases.go
	modified:   vendor/github.com/digitalocean/godo/godo.go
	modified:   vendor/github.com/digitalocean/godo/load_balancers.go
	modified:   vendor/modules.txt

no changes added to commit (use "git add" and/or "git commit -a")

bhardwajRahul · 2024-04-16T16:20:03Z

@bhardwajRahul Most of these changes do not seem to be coming from the godo update. On main:

asb@asb-do-laptop:~/projects/terraform-provider-digitalocean$ git checkout main
Already on 'main'
Your branch is up to date with 'origin/main'.
asb@asb-do-laptop:~/projects/terraform-provider-digitalocean$ go get github.com/digitalocean/godo@v1.113.0
go: upgraded github.com/digitalocean/godo v1.109.1-0.20240228180303-16a4709be517 => v1.113.0
asb@asb-do-laptop:~/projects/terraform-provider-digitalocean$ go mod vendor
asb@asb-do-laptop:~/projects/terraform-provider-digitalocean$ go mod tidy
asb@asb-do-laptop:~/projects/terraform-provider-digitalocean$ git st
On branch main
Your branch is up to date with 'origin/main'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   go.mod
	modified:   go.sum
	modified:   vendor/github.com/digitalocean/godo/CHANGELOG.md
	modified:   vendor/github.com/digitalocean/godo/databases.go
	modified:   vendor/github.com/digitalocean/godo/godo.go
	modified:   vendor/github.com/digitalocean/godo/load_balancers.go
	modified:   vendor/modules.txt

no changes added to commit (use "git add" and/or "git commit -a")

Thanks, Fixed..

andrewsomething · 2024-04-16T16:37:08Z

digitalocean/database/resource_database_cluster.go

+	if database.UIConnection != nil {
+		d.Set("host", database.UIConnection.Host)
+		d.Set("port", database.UIConnection.Port)
+		d.Set("uri", database.UIConnection.URI)
+		d.Set("database", database.UIConnection.Database)
+		d.Set("user", database.UIConnection.User)
+		d.Set("password", database.UIConnection.Password)
+	}


This overwrites the normal connection info when database.UIConnection exists. Is that the intention? If not, we should extend the schema to include new attributes like ui_host, ui_port, etc...

Previously, I thought we might not require connection details and only Dashboard connection details are required in case of opensearch but now I have updated the code and added both.

dweinshenker · 2024-04-19T15:56:57Z

digitalocean/database/resource_database_cluster.go

@@ -524,6 +557,13 @@ func resourceDigitalOceanDatabaseClusterRead(ctx context.Context, d *schema.Reso
 	if err != nil {
 		return diag.Errorf("Error setting connection info for database cluster: %s", err)
 	}
+
+	if database.EngineSlug == opensearchEngineSlug {


not sure we need to check opensearch specifically, we have a check in the setUIConnectionInfo for database.UIConnection != nil. Just so it can be general purpose for other ui connection details for other engine types.

I guess, if we do have plans of incorporating ui connection into other engines also then ya it make sense to skip this check for opensearch.

dweinshenker · 2024-04-19T15:58:50Z

What are your thoughts @andrewsomething and @bhardwajRahul wrt putting the ui connection properties into its own schema (i.e. ui_connection). This way we don't make the top-level properties too wide.

andrewsomething

👍 LGTM!

(Note I did push an additional commit with some changes to the documentation.)

bhardwajRahul marked this pull request as ready for review April 16, 2024 10:20

andrewsomething reviewed Apr 16, 2024

View reviewed changes

bhardwajRahul force-pushed the rbhardwaj/DBAAS-85 branch from 9c35402 to 9f19cf6 Compare April 16, 2024 16:16

bhardwajRahul requested a review from andrewsomething April 16, 2024 16:20

bhardwajRahul marked this pull request as draft April 16, 2024 16:34

andrewsomething reviewed Apr 16, 2024

View reviewed changes

bhardwajRahul marked this pull request as ready for review April 18, 2024 15:20

bhardwajRahul requested a review from andrewsomething April 18, 2024 15:20

Rahul Bhardwaj added 3 commits April 19, 2024 15:56

Add support for opensearch

70b97b2

Upgrade Godo and limit dependencies

4a43784

Add details for opensearch dashboard connection parameters

0abe54e

bhardwajRahul force-pushed the rbhardwaj/DBAAS-85 branch from a9c246c to 0abe54e Compare April 19, 2024 10:30

Merge branch 'main' into rbhardwaj/DBAAS-85

2968c65

dweinshenker reviewed Apr 19, 2024

View reviewed changes

Rahul Bhardwaj and others added 4 commits April 22, 2024 18:49

remove check for opensearch

cc10ee5

Merge branch 'main' into rbhardwaj/DBAAS-85

bdcf616

Merge branch 'main' into rbhardwaj/DBAAS-85

98b554c

Add attribute docs for resource and tweak dat source docs.

2a6832b

andrewsomething approved these changes May 3, 2024

View reviewed changes

andrewsomething merged commit 14d20e2 into digitalocean:main May 3, 2024
3 checks passed

bhardwajRahul deleted the rbhardwaj/DBAAS-85 branch May 3, 2024 15:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Terraform Provider updates for Opensearch #1140

Terraform Provider updates for Opensearch #1140

bhardwajRahul commented Apr 16, 2024

gitguardian bot commented Apr 16, 2024 •

edited

andrewsomething left a comment

bhardwajRahul commented Apr 16, 2024 •

edited

andrewsomething commented Apr 16, 2024

bhardwajRahul commented Apr 16, 2024

andrewsomething Apr 16, 2024

bhardwajRahul Apr 18, 2024 •

edited

dweinshenker Apr 19, 2024

bhardwajRahul Apr 22, 2024

dweinshenker commented Apr 19, 2024

andrewsomething left a comment

Terraform Provider updates for Opensearch #1140

Terraform Provider updates for Opensearch #1140

Conversation

bhardwajRahul commented Apr 16, 2024

gitguardian bot commented Apr 16, 2024 • edited

️✅ There are no secrets present in this pull request anymore.

andrewsomething left a comment

Choose a reason for hiding this comment

bhardwajRahul commented Apr 16, 2024 • edited

andrewsomething commented Apr 16, 2024

bhardwajRahul commented Apr 16, 2024

andrewsomething Apr 16, 2024

Choose a reason for hiding this comment

bhardwajRahul Apr 18, 2024 • edited

Choose a reason for hiding this comment

dweinshenker Apr 19, 2024

Choose a reason for hiding this comment

bhardwajRahul Apr 22, 2024

Choose a reason for hiding this comment

dweinshenker commented Apr 19, 2024

andrewsomething left a comment

Choose a reason for hiding this comment

gitguardian bot commented Apr 16, 2024 •

edited

bhardwajRahul commented Apr 16, 2024 •

edited

bhardwajRahul Apr 18, 2024 •

edited