ENG-12435: Uptake of new Listener API with override repo tls flag and tls mode. #441
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -68,6 +68,16 @@ func updateTest() []resource.TestStep { | |
| DbVersion: "3.4.0", | ||
| }, | ||
| } | ||
| // Override repo client TLS settings. | ||
| overrideRepoClientTLS := SidecarListener{ | ||
| RepoTypes: []string{"mysql"}, | ||
| NetworkAddress: &NetworkAddress{ | ||
| Port: 443, | ||
| Host: "https://s3.test.com", | ||
| }, | ||
| OverrideRepoClientTlsSettings: true, | ||
| TlsMode: "require", | ||
| } | ||
|
|
||
| return []resource.TestStep{ | ||
| setupSidecarListenerTestStep( | ||
|
|
@@ -86,6 +96,10 @@ func updateTest() []resource.TestStep { | |
| "update_test", | ||
| addSettings, | ||
| ), | ||
| setupSidecarListenerTestStep( | ||
| "update_test", | ||
| overrideRepoClientTLS, | ||
| ), | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,9 +52,11 @@ Read-Only: | |
| - `listener_id` (String) | ||
| - `mysql_settings` (Set of Object) (see [below for nested schema](#nestedobjatt--listener_list--mysql_settings)) | ||
| - `network_address` (Set of Object) (see [below for nested schema](#nestedobjatt--listener_list--network_address)) | ||
| - `override_repo_client_tls_settings` (Boolean) | ||
| - `repo_types` (List of String) | ||
| - `s3_settings` (Set of Object) (see [below for nested schema](#nestedobjatt--listener_list--s3_settings)) | ||
| - `sidecar_id` (String) | ||
| - `tls_mode` (String) | ||
|
|
||
| <a id="nestedobjatt--listener_list--dynamodb_settings"></a> | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| # cyral_sidecar_listener (Resource) | ||
|
|
||
| Manages [sidecar listeners](https://cyral.com/docs/sidecars/sidecar-listeners). | ||
| ~> **Warning** Multiple listeners can be associated to a single sidecar as long as `host` and `port` are unique. If `host` is omitted, then `port` must be unique. | ||
|
|
||
| -> Import ID syntax is `{sidecar_id}/{listener_id}`. | ||
|
|
||
|
|
@@ -105,7 +105,12 @@ resource "cyral_sidecar_listener" "listener_dynamodb" { | |
|
|
||
| - `dynamodb_settings` (Block Set, Max: 1) DynamoDB settings. (see [below for nested schema](#nestedblock--dynamodb_settings)) | ||
| - `mysql_settings` (Block Set, Max: 1) MySQL settings represents the listener settings for a [`mysql`, `galera`, `mariadb`] data repository. (see [below for nested schema](#nestedblock--mysql_settings)) | ||
| - `override_repo_client_tls_settings` (Boolean) Override TLS settings defined in the repo. Default value generated by API if not provided. | ||
| - `s3_settings` (Block Set, Max: 1) S3 settings. (see [below for nested schema](#nestedblock--s3_settings)) | ||
| - `tls_mode` (String) TLS mode. Default value generated by API if not provided. Note! This field is in effect only if OverrideRepoClientTlsSettings is set to true or the listener is a SMART port (enabled in more than one binding). Allowed values: | ||
| - `allow` | ||
| - `require` | ||
| - `disable`. | ||
|
|
||
| ### Read-Only | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,76 +3,76 @@ module github.com/cyralinc/terraform-provider-cyral | |
| go 1.19 | ||
|
|
||
| require ( | ||
| github.com/aws/aws-sdk-go v1.44.327 | ||
| github.com/google/uuid v1.3.0 | ||
| github.com/hashicorp/terraform-plugin-docs v0.16.0 | ||
| github.com/hashicorp/terraform-plugin-sdk/v2 v2.27.0 | ||
| github.com/stretchr/testify v1.8.4 | ||
| golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 | ||
| golang.org/x/oauth2 v0.11.0 | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/Masterminds/goutils v1.1.1 // indirect | ||
| github.com/Masterminds/semver/v3 v3.1.1 // indirect | ||
| github.com/Masterminds/sprig/v3 v3.2.2 // indirect | ||
| github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect | ||
| github.com/agext/levenshtein v1.2.3 // indirect | ||
| github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect | ||
| github.com/armon/go-radix v1.0.0 // indirect | ||
| github.com/bgentry/speakeasy v0.1.0 // indirect | ||
| github.com/cloudflare/circl v1.3.3 // indirect | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/fatih/color v1.15.0 // indirect | ||
| github.com/golang/protobuf v1.5.3 // indirect | ||
| github.com/google/go-cmp v0.5.9 // indirect | ||
| github.com/hashicorp/errwrap v1.1.0 // indirect | ||
| github.com/hashicorp/go-checkpoint v0.5.0 // indirect | ||
| github.com/hashicorp/go-cleanhttp v0.5.2 // indirect | ||
| github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect | ||
| github.com/hashicorp/go-hclog v1.5.0 // indirect | ||
| github.com/hashicorp/go-multierror v1.1.1 // indirect | ||
| github.com/hashicorp/go-plugin v1.4.10 // indirect | ||
| github.com/hashicorp/go-uuid v1.0.3 // indirect | ||
| github.com/hashicorp/go-version v1.6.0 // indirect | ||
| github.com/hashicorp/hc-install v0.5.2 // indirect | ||
| github.com/hashicorp/hcl/v2 v2.17.0 // indirect | ||
| github.com/hashicorp/logutils v1.0.0 // indirect | ||
| github.com/hashicorp/terraform-exec v0.18.1 // indirect | ||
| github.com/hashicorp/terraform-json v0.17.1 // indirect | ||
| github.com/hashicorp/terraform-plugin-go v0.18.0 // indirect | ||
| github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect | ||
| github.com/hashicorp/terraform-registry-address v0.2.2 // indirect | ||
| github.com/hashicorp/terraform-svchost v0.1.1 // indirect | ||
| github.com/hashicorp/yamux v0.1.1 // indirect | ||
| github.com/huandu/xstrings v1.3.2 // indirect | ||
| github.com/imdario/mergo v0.3.13 // indirect | ||
| github.com/mattn/go-colorable v0.1.13 // indirect | ||
| github.com/mattn/go-isatty v0.0.19 // indirect | ||
| github.com/mitchellh/cli v1.1.5 // indirect | ||
| github.com/mitchellh/copystructure v1.2.0 // indirect | ||
| github.com/mitchellh/go-testing-interface v1.14.1 // indirect | ||
| github.com/mitchellh/go-wordwrap v1.0.1 // indirect | ||
| github.com/mitchellh/mapstructure v1.5.0 // indirect | ||
| github.com/mitchellh/reflectwalk v1.0.2 // indirect | ||
| github.com/oklog/run v1.1.0 // indirect | ||
| github.com/pmezard/go-difflib v1.0.0 // indirect | ||
| github.com/posener/complete v1.2.3 // indirect | ||
| github.com/russross/blackfriday v1.6.0 // indirect | ||
| github.com/shopspring/decimal v1.3.1 // indirect | ||
| github.com/spf13/cast v1.5.0 // indirect | ||
| github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect | ||
| github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect | ||
| github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect | ||
| github.com/zclconf/go-cty v1.13.2 // indirect | ||
| golang.org/x/crypto v0.12.0 // indirect | ||
| golang.org/x/mod v0.12.0 // indirect | ||
| golang.org/x/net v0.14.0 // indirect | ||
| golang.org/x/sys v0.11.0 // indirect | ||
| golang.org/x/text v0.12.0 // indirect | ||
| google.golang.org/appengine v1.6.7 // indirect | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect | ||
| google.golang.org/grpc v1.57.0 // indirect | ||
| google.golang.org/protobuf v1.31.0 // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| ) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gengdahlCyral could you please also add validation for the possible values that are valid for this field? I understand that the API already does this validation and that it is easier to maintain if we don't duplicate the validation here in the terraform provider, but since the validation messages returned by the API are often not clear enough, adding a validation that is computed during the terraform plan instead of during the execution, and that also provides a proper message that explicitly mentions the error and which values are allowed for this field would improve the terraform provider UX overall, which is something we are aiming for in a recent conversation that I had with @wcmjunior. The validation could be something like: