Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

azurerm_data_factory_linked_service_sql_server: add key_vault_connection_string argument #12117

Merged
merged 5 commits into from
Jun 9, 2021
Merged

azurerm_data_factory_linked_service_sql_server: add key_vault_connection_string argument #12117

merged 5 commits into from
Jun 9, 2021

Conversation

favoretti
Copy link
Collaborator

Fixes #10758 (comment)

$ TF_ACC=1 go test -v ./azurerm/internal/services/datafactory -timeout=1000m -run='TestAccDataFactoryLinkedServiceSQLServer'
2021/06/08 18:59:44 [DEBUG] not using binary driver name, it's no longer needed
2021/06/08 18:59:44 [DEBUG] not using binary driver name, it's no longer needed
=== RUN   TestAccDataFactoryLinkedServiceSQLServer_basic
=== PAUSE TestAccDataFactoryLinkedServiceSQLServer_basic
=== RUN   TestAccDataFactoryLinkedServiceSQLServer_PasswordKeyVaultReference
=== PAUSE TestAccDataFactoryLinkedServiceSQLServer_PasswordKeyVaultReference
=== RUN   TestAccDataFactoryLinkedServiceSQLServer_ConnectionStringKeyVaultReference
=== PAUSE TestAccDataFactoryLinkedServiceSQLServer_ConnectionStringKeyVaultReference
=== CONT  TestAccDataFactoryLinkedServiceSQLServer_basic
=== CONT  TestAccDataFactoryLinkedServiceSQLServer_ConnectionStringKeyVaultReference
=== CONT  TestAccDataFactoryLinkedServiceSQLServer_PasswordKeyVaultReference
--- PASS: TestAccDataFactoryLinkedServiceSQLServer_basic (168.50s)
--- PASS: TestAccDataFactoryLinkedServiceSQLServer_PasswordKeyVaultReference (309.00s)
--- PASS: TestAccDataFactoryLinkedServiceSQLServer_ConnectionStringKeyVaultReference (309.43s)
PASS
ok  	github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/datafactory	310.922s

@ghost ghost added size/L labels Jun 8, 2021
magodo
magodo requested changes Jun 9, 2021
View reviewed changes
Copy link
Collaborator

@magodo magodo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@favoretti I've left some minor comments inline, over all it LGTM!

azurerm/internal/services/datafactory/data_factory_linked_service_sql_server_resource.go Outdated
Comment on lines 58 to 59
AtLeastOneOf: []string{"connection_string", "key_vault_connection_string"},
ConflictsWith: []string{"key_vault_connection_string"},
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean ExactlyOneOf?

Suggested change
AtLeastOneOf: []string{"connection_string", "key_vault_connection_string"},
ConflictsWith: []string{"key_vault_connection_string"},
ExactlyOneOf: []string{"connection_string", "key_vault_connection_string"},

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yes, thank you. Got lost in all those :) will push in a sec.

azurerm/internal/services/datafactory/data_factory_linked_service_sql_server_resource.go Outdated
Comment on lines 67 to 68
AtLeastOneOf: []string{"connection_string", "key_vault_connection_string"},
ConflictsWith: []string{"connection_string"},
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean ExactlyOneOf?

azurerm/internal/services/datafactory/data_factory.go Outdated

return []interface{}{parameters}
}

func flattenAzureKeyVaultPassword(secretReference *datafactory.AzureKeyVaultSecretReference) []interface{} {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also rename method to flattenAzureKeyVaultSecretReference?

@magodo
Copy link
Collaborator

magodo commented Jun 9, 2021

@favoretti LGTM 👍
image

@magodo magodo merged commit 9c143c5 into hashicorp:master Jun 9, 2021
@magodo magodo added this to the v2.63.0 milestone Jun 9, 2021
magodo added a commit that referenced this pull request Jun 9, 2021
@magodo
Update to include #12117
0b7155d
@ghost
Copy link

ghost commented Jun 11, 2021

This has been released in version 2.63.0 of the provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading. As an example:

provider "azurerm" {
    version = "~> 2.63.0"
}
# ... other configuration ...

@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 12, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@magodo magodo magodo requested changes

Assignees
No one assigned
Labels
documentation enhancement service/data-factory size/L
Projects
None yet
Milestone
v2.63.0
Development

Successfully merging this pull request may close these issues.

Support for secrets in key vault for azurerm_data_factory_linked_service_azure_sql_database
2 participants
@favoretti @magodo