This repository has been archived by the owner on Jan 15, 2024. It is now read-only.
Add organization ID to client connection using header #9
Conversation
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 was referenced Oct 16, 2020
aknuds1
changed the title
|
Having a look. |
aknuds1
suggested changes
Oct 16, 2020
aknuds1
suggested changes
Oct 16, 2020
There was a problem hiding this comment.
Just some quick feedback for now, to collect feedback until I have the time for a real review:
- Org ID should not be provided if authing with an API key, because an API key is for a single org and role, so only applicable with basic auth
- Making org ID mandatory for creating a client is a bad idea
- Allowing the org ID header to be set when using basic auth makes sense
Merged
|
Can you please merge master into the PR, and fix conflicts? I changed the signature of Client.New, so you can add the organization ID to the Config type parameter. |
|
I shall do - those changes for the config make adding optional orgid a much cleaner change - thanks. Will update in the next day or so. |
This seems like the right place to do so - the resource API calls that require an organization ID that are not-quite RESTful also would need authentication with a user that is an administrator for the organization. So putting it in at this level works out, and also avoids adding orgID parameters all over the place. Co-authored-by: hansnqyr <[email protected]>
|
I've rebased and the change is now much simpler - thanks. |
|
Thanks, I'll have a look when I get the time. |
|
Having a look again. |
marefr
suggested changes
Oct 27, 2020
|
Thanks for the contribution! |
medains
added a commit
to medains/terraform-provider-grafana
that referenced
this pull request
Oct 28, 2020
Use the change in grafana/grafana-api-golang-client#9 to apply an organization id to the provider. Usage might look like this: ```hcl provider "grafana" { url = "someurl" auth = "adminuser:somepass" } resource "grafana_organization" "neworg" { name = "neworg" admin = "neworgadmin" } provider "grafana" { alias = "neworg" url = "someurl" auth = "neworgadmin:somepass" org_id = grafana_organization.neworg.org_id } resource "grafana_data_source" "neworg_graphite" { provider = grafana.neworg type = "graphite" name = "neworg-graphite" } ``` Co-authored-by: hansnqyr <[email protected]>
medains
added a commit
to medains/terraform-provider-grafana
that referenced
this pull request
Oct 28, 2020
Use the change in grafana/grafana-api-golang-client#9 to apply an organization id to the provider. Usage might look like this: ```hcl provider "grafana" { url = "someurl" auth = "adminuser:somepass" } resource "grafana_organization" "neworg" { name = "neworg" admin = "neworgadmin" } provider "grafana" { alias = "neworg" url = "someurl" auth = "neworgadmin:somepass" org_id = grafana_organization.neworg.org_id } resource "grafana_data_source" "neworg_graphite" { provider = grafana.neworg type = "graphite" name = "neworg-graphite" } ``` Co-authored-by: hansnqyr <[email protected]>
medains
added a commit
to medains/terraform-provider-grafana
that referenced
this pull request
Oct 28, 2020
Use the change in grafana/grafana-api-golang-client#9 to apply an organization id to the provider. Usage might look like this: ```hcl provider "grafana" { url = "someurl" auth = "adminuser:somepass" } resource "grafana_organization" "neworg" { name = "neworg" admin = "neworgadmin" } provider "grafana" { alias = "neworg" url = "someurl" auth = "neworgadmin:somepass" org_id = grafana_organization.neworg.org_id } resource "grafana_data_source" "neworg_graphite" { provider = grafana.neworg type = "graphite" name = "neworg-graphite" } ``` Co-authored-by: hansnqyr <[email protected]>
gw0
reviewed
Nov 2, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This seems like the right place to do so - the resource API calls that require an organization ID that are not-quite RESTful also would need authentication with a user that is an administrator for the organization. So putting it in at this level works out, and also avoids adding orgID parameters all over the place.
Co-authored-by: hansnqyr [email protected]
This change was previously submitted to nytm/go-grafana-api#62
It is a prerequisite for this PR: grafana/terraform-provider-grafana#110