Moving client creation to resource to allow for provider interpolation #119

john-delivuk-rl · 2020-12-08T21:29:47Z

While looking through I noticed several issues around being able to interpolate the provider. While this was an issue in previous version of terraform, it's been resolved. You can see in providers like MySQL, the providerConfigure only returns a configuration struct. I've implemented the same pattern to allow for proper resource dependencies. I think a few tests might still have an issue, but I'll work to remediate these today.

I think long term this code would benefit an interface around elastic search and a class factory to simply that logic, I tried to leave as much of the existing code alone as possible, as this is a large change already.

UPDATE: Running this locally and everything is running great. It's so nice to not use work arounds :)

phillbaker · 2020-12-09T03:11:23Z

Thanks for doing this! I'm curious why this isn't building on travis.

john-delivuk-rl · 2020-12-09T03:13:57Z

I was curious about that too. I wasn't sure if there was something manual. Let me take a peak.

john-delivuk-rl · 2020-12-09T03:14:18Z

.... I'm assuming you just did something xD

john-delivuk-rl · 2020-12-09T05:31:20Z

Looks like Travis has disabled OSS builds. If you can trigger a rebuild when you have a second. This should be close..

john-delivuk-rl · 2020-12-09T22:52:32Z

@phillbaker Happy to donate some money for additional credits. Right now the lowest price point for me to give credits is $70, and I'm more in the $10 - $20 contribution range :)

Would love to see this get merged and consume it.

phillbaker · 2020-12-09T22:59:56Z

I'm in the process of moving this repo to github actions. For the time being, if you'd like to run the tests locally, that'd be the quickest way to iterate on this PR.

john-delivuk-rl · 2020-12-09T23:48:19Z

Will do.

john-delivuk-rl · 2020-12-11T06:46:02Z

Tests are passing locally. Let me know if I can do anything further.

<no state>
2020/12/11 01:43:30 [INFO] terraform: building graph: GraphTypeApply
2020/12/11 01:43:30 [WARN] Provider "elasticsearch" produced an invalid plan for elasticsearch_xpack_watch.test_watch, but we are tolerating it because it is using the legacy plugin SDK.
    The following problems may be the cause of any confusing errors from downstream operations:
      - .body: planned value cty.StringVal("{\"actions\":{\"test_log\":{\"logging\":{\"level\":\"info\",\"text\":\"executed at {{ctx.execution_time}}\"}}},\"condition\":{\"always\":{}},\"input\":{\"simple\":{\"payload\":{\"send\":\"yes\"}}},\"trigger\":{\"schedule\":{\"hourly\":{\"minute\":[0,5]}}}}") does not match config value cty.StringVal("{\n  \"input\": {\n    \"simple\": {\n      \"payload\": {\n        \"send\": \"yes\"\n      }\n    }\n  },\n  \"condition\": {\n    \"always\": {}\n  },\n  \"trigger\": {\n    \"schedule\": {\n      \"hourly\": {\n        \"minute\": [0, 5]\n      }\n    }\n  },\n  \"actions\": {\n    \"test_log\": {\n\t    \"logging\": {\n\t    \t\"level\": \"info\",\n\t      \"text\": \"executed at {{ctx.execution_time}}\"\n\t    }\n\t  }\n  }\n}\n")
2020/12/11 01:43:30 [INFO] Pinging url to determine version http://elastic:[email protected]:9210
2020/12/11 01:43:30 [INFO] Object ID: my_watch
2020/12/11 01:43:30 [WARN] Provider "elasticsearch" produced an unexpected new value for elasticsearch_xpack_watch.test_watch, but we are tolerating it because it is using the legacy plugin SDK.
    The following problems may be the cause of any confusing errors from downstream operations:
      - .body: was cty.StringVal("{\"actions\":{\"test_log\":{\"logging\":{\"level\":\"info\",\"text\":\"executed at {{ctx.execution_time}}\"}}},\"condition\":{\"always\":{}},\"input\":{\"simple\":{\"payload\":{\"send\":\"yes\"}}},\"trigger\":{\"schedule\":{\"hourly\":{\"minute\":[0,5]}}}}"), but now cty.StringVal("{\"trigger\":{\"schedule\":{\"hourly\":{\"minute\":[0,5]}}},\"input\":{\"simple\":{\"payload\":{\"send\":\"yes\"}}},\"condition\":{\"always\":{}},\"actions\":{\"test_log\":{\"logging\":{\"level\":\"info\",\"text\":\"executed at {{ctx.execution_time}}\"}}}}")
2020/12/11 01:43:30 [INFO] terraform: building graph: GraphTypePlan
2020/12/11 01:43:30 [INFO] terraform: building graph: GraphTypeRefresh
2020/12/11 01:43:30 [INFO] Pinging url to determine version http://elastic:[email protected]:9210
2020/12/11 01:43:30 [INFO] terraform: building graph: GraphTypePlan
2020/12/11 01:43:30 [WARN] Test: Executing destroy step
2020/12/11 01:43:30 [INFO] terraform: building graph: GraphTypeValidate
2020/12/11 01:43:30 [INFO] terraform: building graph: GraphTypeRefresh
2020/12/11 01:43:30 [INFO] Pinging url to determine version http://elastic:[email protected]:9210
2020/12/11 01:43:30 [INFO] terraform: building graph: GraphTypePlanDestroy
2020/12/11 01:43:30 [WARN] Test: Step plan: DIFF:

DESTROY: elasticsearch_xpack_watch.test_watch
  body:     "{\"trigger\":{\"schedule\":{\"hourly\":{\"minute\":[0,5]}}},\"input\":{\"simple\":{\"payload\":{\"send\":\"yes\"}}},\"condition\":{\"always\":{}},\"actions\":{\"test_log\":{\"logging\":{\"level\":\"info\",\"text\":\"executed at {{ctx.execution_time}}\"}}}}" => ""
  id:       "my_watch" => ""
  watch_id: "my_watch" => ""



STATE:

elasticsearch_xpack_watch.test_watch:
  ID = my_watch
  provider = provider.elasticsearch
  body = {"trigger":{"schedule":{"hourly":{"minute":[0,5]}}},"input":{"simple":{"payload":{"send":"yes"}}},"condition":{"always":{}},"actions":{"test_log":{"logging":{"level":"info","text":"executed at {{ctx.execution_time}}"}}}}
  watch_id = my_watch
2020/12/11 01:43:30 [INFO] terraform: building graph: GraphTypeApply
2020/12/11 01:43:30 DestroyEdgeTransformer: pruning unused resource node elasticsearch_xpack_watch.test_watch (prepare state)
2020/12/11 01:43:30 [INFO] Pinging url to determine version http://elastic:[email protected]:9210
2020/12/11 01:43:31 [INFO] terraform: building graph: GraphTypePlanDestroy
2020/12/11 01:43:31 [INFO] terraform: building graph: GraphTypeRefresh
2020/12/11 01:43:31 [INFO] terraform: building graph: GraphTypePlanDestroy
--- PASS: TestAccElasticsearchWatch (0.28s)
PASS
coverage: 55.4% of statements
ok  	github.com/phillbaker/terraform-provider-elasticsearch/es	20.030s	coverage: 55.4% of statements

john-delivuk-rl · 2020-12-14T21:08:57Z

Saw another that in PR 120, the contributor setup travis in his own account. So I followed suit
https://travis-ci.com/github/john-delivuk-rl/terraform-provider-elasticsearch/builds/208632650

phillbaker

thanks for the work on this, much appreciated!

phillbaker · 2020-12-15T04:09:47Z

es/resource_elasticsearch_xpack_role.go

+	if err != nil {
+		return err
+	}
+	if client, ok := esClient.(*elastic7.Client); ok {


I should come back and use a switch/case here

phillbaker · 2020-12-15T04:10:10Z

es/resource_elasticsearch_kibana_object.go

@@ -8,6 +8,7 @@ import (

 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/structure"
+
 	// "github.com/hashicorp/terraform-plugin-sdk/helper/validation"


Whoops, I should clean this up

phillbaker · 2020-12-15T04:10:27Z

es/resource_elasticsearch_xpack_role_mapping.go

 		return elastic7PutRoleMapping(client, name, body)
 	}
-	if client, ok := m.(*elastic6.Client); ok {
+	if client, ok := esClient.(*elastic6.Client); ok {


Same here, I should come back and use a switch/case in this file

phillbaker · 2020-12-15T04:12:07Z

es/resource_elasticsearch_xpack_user.go

+	if err != nil {
+		return err
+	}
+	if client, ok := esClient.(*elastic7.Client); ok {


More eventual clean up for switch/case

* origin/master: Moving client creation to resource to allow for provider interpolation (phillbaker#119)

john-delivuk-rl · 2020-12-15T21:22:33Z

Thanks for accepting this. Any idea on timeline for cutting another revision?

phillbaker · 2020-12-21T02:15:43Z

@john-delivuk-rl sorry for the slow response, it's released in https://registry.terraform.io/providers/phillbaker/elasticsearch/1.5.1-beta1, should be a full 1.5.1 in the next couple of days.

Moving client creation to allow for provider interpolation

1540ba0

This was referenced Dec 8, 2020

"no Elasticsearch node available" when using module input #111

Closed

Feature request: create the cluster AND the index in the same run #63

Closed

Provider variable interpolation error during import #23

Closed

Interpolation Support for URL #11

Closed

john-delivuk-rl changed the title ~~Moving client creation to allow for provider interpolation~~ Moving client creation to resource to allow for provider interpolation Dec 8, 2020

john-delivuk-rl added 2 commits December 8, 2020 22:24

mod tidy

5df7dd4

Few test fixes

eaca8de

Correcting interface usage in tests

19587f6

john-delivuk-rl force-pushed the provider-interpolation branch from d5e0b35 to 19587f6 Compare December 9, 2020 14:53

phillbaker mentioned this pull request Dec 10, 2020

Add support for ElasticSearch 7.8+ Index templates #120

Merged

john-delivuk-rl added 2 commits December 11, 2020 00:57

Fixing Tests

b768e5a

Missing clients in methods

76a8ecc

add changelog

8c25a6d

phillbaker approved these changes Dec 15, 2020

View reviewed changes

phillbaker merged commit 5302ba1 into phillbaker:master Dec 15, 2020

john-delivuk-rl deleted the provider-interpolation branch December 15, 2020 21:23

michelzanini mentioned this pull request Dec 28, 2020

Regression issue on 1.5.1 #124

Closed

phillbaker mentioned this pull request Jan 9, 2021

https connection misconfiguration not exposed #127

Open

michelzanini mentioned this pull request Apr 7, 2021

Support AWS Single-Sign On (SSO) cached credentials when using AWS profiles #162

Closed

phillbaker mentioned this pull request May 28, 2021

Checking compatibility with Elastic Cloud provider #176

Closed

phillbaker mentioned this pull request Aug 2, 2021

OpenDistro Security Parallel Writes #206

Closed

phillbaker mentioned this pull request May 24, 2023

Support for multiple OpenSearch domains/workspaces/endpoints #340

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Moving client creation to resource to allow for provider interpolation #119

Moving client creation to resource to allow for provider interpolation #119

john-delivuk-rl commented Dec 8, 2020 •

edited

Loading

phillbaker commented Dec 9, 2020

john-delivuk-rl commented Dec 9, 2020

john-delivuk-rl commented Dec 9, 2020

john-delivuk-rl commented Dec 9, 2020

john-delivuk-rl commented Dec 9, 2020

phillbaker commented Dec 9, 2020

john-delivuk-rl commented Dec 9, 2020

john-delivuk-rl commented Dec 11, 2020

john-delivuk-rl commented Dec 14, 2020

phillbaker left a comment

phillbaker Dec 15, 2020

phillbaker Dec 15, 2020

phillbaker Dec 15, 2020

phillbaker Dec 15, 2020

john-delivuk-rl commented Dec 15, 2020

phillbaker commented Dec 21, 2020

Moving client creation to resource to allow for provider interpolation #119

Moving client creation to resource to allow for provider interpolation #119

Conversation

john-delivuk-rl commented Dec 8, 2020 • edited Loading

phillbaker commented Dec 9, 2020

john-delivuk-rl commented Dec 9, 2020

john-delivuk-rl commented Dec 9, 2020

john-delivuk-rl commented Dec 9, 2020

john-delivuk-rl commented Dec 9, 2020

phillbaker commented Dec 9, 2020

john-delivuk-rl commented Dec 9, 2020

john-delivuk-rl commented Dec 11, 2020

john-delivuk-rl commented Dec 14, 2020

phillbaker left a comment

Choose a reason for hiding this comment

phillbaker Dec 15, 2020

Choose a reason for hiding this comment

phillbaker Dec 15, 2020

Choose a reason for hiding this comment

phillbaker Dec 15, 2020

Choose a reason for hiding this comment

phillbaker Dec 15, 2020

Choose a reason for hiding this comment

john-delivuk-rl commented Dec 15, 2020

phillbaker commented Dec 21, 2020

john-delivuk-rl commented Dec 8, 2020 •

edited

Loading