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.

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

data source azurerm_client_config: always set all properties #2120

Merged
merged 1 commit into from
Oct 30, 2018

Conversation

katbyte
Copy link
Collaborator

@katbyte katbyte commented Oct 19, 2018

Fixes #2108

@katbyte
Copy link
Collaborator Author

katbyte commented Oct 19, 2018

Tests pass:

gofmt -w $(find . -name '*.go' |grep -v vendor)
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./azurerm -v -test.run=TestAccDataSourceAzureRMClientConfig -timeout 180m -ldflags="-X=github.com/terraform-providers/terraform-provider-azurerm/version.ProviderVersion=acc"
=== RUN   TestAccDataSourceAzureRMClientConfig_basic
--- PASS: TestAccDataSourceAzureRMClientConfig_basic (19.47s)
PASS
ok  	github.com/terraform-providers/terraform-provider-azurerm/azurerm	19.504s

Copy link
Collaborator

@WodansSon WodansSon left a comment

Choose a reason for hiding this comment

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

@katbyte LGTM

Copy link
Contributor

@metacpp metacpp left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@tombuildsstuff tombuildsstuff left a comment

Choose a reason for hiding this comment

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

otherwise LGTM 👍

@@ -68,6 +68,9 @@ func dataSourceArmClientConfigRead(d *schema.ResourceData, meta interface{}) err
if principal := servicePrincipal; principal != nil {
d.Set("service_principal_application_id", principal.AppID)
d.Set("service_principal_object_id", principal.ObjectID)
} else {
d.Set("service_principal_application_id", "")
d.Set("service_principal_object_id", "")
}
Copy link
Contributor

Choose a reason for hiding this comment

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

as discussed IRL I think we should look to replace these in time with more generic application_id and object_id fields which are available for users too

@tombuildsstuff tombuildsstuff merged commit 195a9c4 into master Oct 30, 2018
@tombuildsstuff tombuildsstuff deleted the b/data_client_config-alwayssetprops branch October 30, 2018 09:58
tombuildsstuff added a commit that referenced this pull request Oct 30, 2018
@ghost
Copy link

ghost commented Mar 6, 2019

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. If you feel I made an error 🤖 🙉 , please reach out to my human friends 👉 [email protected]. Thanks!

@ghost ghost locked and limited conversation to collaborators Mar 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants