init os-login sshkey #3221

sebglon · 2020-03-05T11:47:50Z

Create new terraform resource oslogin SSHPublicKey

hashicorp/terraform-provider-google#5389

Use-case 1: add the ssh public key on current the user defined on the provider
User email is set by default with the current userinfO
Use-case 2: add the ssh public key on a specific user
User email is provided with impersonated provider and google_client_openid_userinfo
example here

Release Note Template for Downstream PRs (will be copied)

`google_os_login_ssh_public_key`

modular-magician · 2020-03-05T11:49:38Z

Hello! I am a robot who works on Magic Modules PRs.

I have detected that you are a community contributor, so your PR will be assigned to someone with a commit-bit on this repo for initial review. They will authorize it to run through our CI pipeline, which will generate downstream PRs.

Thanks for your contribution! A human will be with you soon.

@rileykarson, please review this PR or find an appropriate assignee.

modular-magician · 2020-03-05T13:42:18Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 6 files changed, 628 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 6 files changed, 628 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 2 files changed, 97 insertions(+))
TF OiCS: Diff ( 4 files changed, 115 insertions(+))

modular-magician · 2020-03-05T13:44:28Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 6 files changed, 628 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 6 files changed, 628 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 2 files changed, 97 insertions(+))
TF OiCS: Diff ( 4 files changed, 115 insertions(+))

modular-magician · 2020-03-05T13:45:35Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 6 files changed, 628 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 6 files changed, 628 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 2 files changed, 97 insertions(+))
TF OiCS: Diff ( 4 files changed, 115 insertions(+))

rileykarson

Looking good so far! I made a first pass at reviewing.

products/oslogin/api.yaml

templates/terraform/examples/os_login_ssh_key_add.tf.erb

products/oslogin/terraform.yaml

sebglon · 2020-03-05T19:25:51Z

Hi today i have an issue.
We can upload a public key for a service account.
I am the owner of the project but i can't add an SSH Key for a service account on this project.
i have this message: End user credentials must match the user specified in the request.

Is it possible for this API to use something like "impersonate-service-account"

modular-magician · 2020-03-05T19:38:19Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 6 files changed, 616 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 6 files changed, 616 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 2 files changed, 87 insertions(+))
TF OiCS: Diff ( 4 files changed, 115 insertions(+))

modular-magician · 2020-03-05T20:00:53Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 7 files changed, 570 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 7 files changed, 570 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 2 files changed, 77 insertions(+))
TF OiCS: Diff ( 4 files changed, 105 insertions(+))

rileykarson · 2020-03-05T20:22:01Z

Got it- we can probably auth as the service account like in this: https://www.terraform.io/docs/providers/google/d/datasource_google_service_account_access_token.html

Alternatively https://www.terraform.io/docs/providers/google/d/datasource_google_client_openid_userinfo.html returns the current user.

modular-magician · 2020-03-05T20:24:38Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 7 files changed, 582 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 7 files changed, 582 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 2 files changed, 77 insertions(+))
TF OiCS: Diff ( 4 files changed, 105 insertions(+))

modular-magician · 2020-03-05T21:53:56Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 7 files changed, 597 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 7 files changed, 597 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 2 files changed, 82 insertions(+))
TF OiCS: Diff ( 4 files changed, 105 insertions(+))

modular-magician · 2020-03-05T22:11:14Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 7 files changed, 591 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 7 files changed, 591 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 2 files changed, 82 insertions(+))
TF OiCS: Diff ( 4 files changed, 105 insertions(+))

sebglon · 2020-03-05T22:11:43Z

Hi,
is to possible to get the current user defined on the provuder to put them as default value on the user field?

rileykarson · 2020-03-05T23:20:00Z

Yep- that's https://www.terraform.io/docs/providers/google/d/datasource_google_client_openid_userinfo.html

modular-magician · 2020-03-06T12:05:18Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 9 files changed, 617 insertions(+), 10 deletions(-))
Terraform Beta: Diff ( 9 files changed, 617 insertions(+), 10 deletions(-))
TF Conversion: Diff ( 2 files changed, 92 insertions(+))
TF OiCS: Diff ( 4 files changed, 104 insertions(+))

sebglon · 2020-03-06T12:10:12Z

HI,
The defautl user email is now well setted.
But on the test i have this error Create response didn't contain critical fields. Create may not have succeeded.

I don't understand because the resp object is empty but not when i run the same API from here

And how can i decode properly the loginProfile json?

products/oslogin/api.yaml

products/oslogin/terraform.yaml

templates/terraform/post_create/sshkeyfingerprint.erb

products/oslogin/terraform.yaml

modular-magician · 2020-03-06T18:04:47Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 9 files changed, 597 insertions(+), 10 deletions(-))
Terraform Beta: Diff ( 9 files changed, 597 insertions(+), 10 deletions(-))
TF Conversion: Diff ( 2 files changed, 72 insertions(+))
TF OiCS: Diff ( 4 files changed, 104 insertions(+))

modular-magician · 2020-03-06T18:06:14Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 9 files changed, 597 insertions(+), 10 deletions(-))
Terraform Beta: Diff ( 9 files changed, 597 insertions(+), 10 deletions(-))
TF Conversion: Diff ( 2 files changed, 72 insertions(+))
TF OiCS: Diff ( 4 files changed, 104 insertions(+))

modular-magician · 2020-03-06T19:07:56Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 9 files changed, 623 insertions(+), 10 deletions(-))
Terraform Beta: Diff ( 9 files changed, 623 insertions(+), 10 deletions(-))
TF Conversion: Diff ( 2 files changed, 92 insertions(+))
TF OiCS: Diff ( 4 files changed, 104 insertions(+))

modular-magician · 2020-03-06T20:12:36Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 9 files changed, 629 insertions(+), 10 deletions(-))
Terraform Beta: Diff ( 9 files changed, 629 insertions(+), 10 deletions(-))
TF Conversion: Diff ( 2 files changed, 92 insertions(+))
TF OiCS: Diff ( 4 files changed, 104 insertions(+))

modular-magician · 2020-03-09T12:28:17Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 9 files changed, 597 insertions(+), 10 deletions(-))
Terraform Beta: Diff ( 9 files changed, 597 insertions(+), 10 deletions(-))
TF Conversion: Diff ( 2 files changed, 67 insertions(+))
TF OiCS: Diff ( 4 files changed, 108 insertions(+))

sebglon · 2020-03-09T12:28:38Z

Now i have a new error on import:

make testacc TEST=./google TESTARGS='-run=TestAccOSLogin*'
==> Checking source code against gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 TF_SCHEMA_PANIC_ON_ERROR=1 go test ./google -v -run=TestAccOSLogin* -timeout 240m -ldflags="-X=github.com/terraform-providers/terraform-provider-google/version.ProviderVersion=acc"
=== RUN   TestAccOSLoginSSHPublicKey_osLoginSshKeyProvidedUserExample
=== PAUSE TestAccOSLoginSSHPublicKey_osLoginSshKeyProvidedUserExample
=== CONT  TestAccOSLoginSSHPublicKey_osLoginSshKeyProvidedUserExample
panic: Invalid address to set: []string{"name"}

goroutine 482 [running]:
github.com/hashicorp/terraform-plugin-sdk/helper/schema.(*ResourceData).Set(0xc0000cc1c0, 0x2990f74, 0x4, 0x22f16c0, 0xc0008c25a0, 0x0, 0x0)
	/home/sebastien/go/pkg/mod/github.com/hashicorp/[email protected]/helper/schema/resource_data.go:203 +0x2ee
github.com/terraform-providers/terraform-provider-google/google.parseImportId(0xc000936400, 0x2, 0x2, 0x2f95a20, 0xc0000cc1c0, 0xc000b1eb00, 0xc0005a6e70, 0x290f0a1)
	/home/sebastien/go/src/github.com/terraform-providers/terraform-provider-google/google/import.go:45 +0x4fa
github.com/terraform-providers/terraform-provider-google/google.resourceOSLoginSSHPublicKeyImport(0xc0000cc1c0, 0x250bf20, 0xc000b1eb00, 0x1e, 0xc0007ce1e8, 0x7ff42c23ce01, 0x0, 0x2)
	/home/sebastien/go/src/github.com/terraform-providers/terraform-provider-google/google/resource_os_login_ssh_public_key.go:219 +0xae

I have no name properties on this object.
How can i skip this on import?

If i set the import_format: ["users/{{user}}/sshPublicKeys/{{fingerprint}}"] the parameters are bad:

TestAccOSLoginSSHPublicKey_osLoginSshKeyProvidedUserExample: testing.go:635: Step 1 error: Error reading OSLoginSSHPublicKey "users/users/sshPublicKeys/<My_EMAIL>/": googleapi: Error 403: End user credentials must match the user specified in the request.

products/oslogin/api.yaml

modular-magician · 2020-03-11T14:06:49Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 9 files changed, 597 insertions(+), 10 deletions(-))
Terraform Beta: Diff ( 9 files changed, 597 insertions(+), 10 deletions(-))
TF Conversion: Diff ( 2 files changed, 67 insertions(+))
TF OiCS: Diff ( 4 files changed, 108 insertions(+))

templates/terraform/post_create/sshkeyfingerprint.go.erb

products/oslogin/api.yaml

Co-Authored-By: Riley Karson <[email protected]>

modular-magician · 2020-03-18T09:57:30Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 10 files changed, 603 insertions(+), 10 deletions(-))
Terraform Beta: Diff ( 10 files changed, 603 insertions(+), 10 deletions(-))
TF Conversion: Diff ( 2 files changed, 67 insertions(+))
TF OiCS: Diff ( 4 files changed, 108 insertions(+))

sebglon · 2020-03-18T10:00:34Z

$ make testacc TEST=./google TESTARGS='-run=TestAccOSLogin*'
==> Checking source code against gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 TF_SCHEMA_PANIC_ON_ERROR=1 go test ./google -v -run=TestAccOSLogin* -timeout 240m -ldflags="-X=github.com/terraform-providers/terraform-provider-google/version.ProviderVersion=acc"
=== RUN   TestAccOSLoginSSHPublicKey_osLoginSshKeyProvidedUserExample
=== PAUSE TestAccOSLoginSSHPublicKey_osLoginSshKeyProvidedUserExample
=== CONT  TestAccOSLoginSSHPublicKey_osLoginSshKeyProvidedUserExample
--- PASS: TestAccOSLoginSSHPublicKey_osLoginSshKeyProvidedUserExample (5.59s)
PASS
ok  	github.com/terraform-providers/terraform-provider-google/google	5.618s

modular-magician · 2020-03-18T10:04:20Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 10 files changed, 610 insertions(+), 10 deletions(-))
Terraform Beta: Diff ( 10 files changed, 610 insertions(+), 10 deletions(-))
TF Conversion: Diff ( 2 files changed, 67 insertions(+))
TF OiCS: Diff ( 4 files changed, 108 insertions(+))

rileykarson

I added a couple small nitpicks- I've just gotta verify the test in CI to merge, and the changes in sourcerepo are causing a compiler error stopping that from working.

rileykarson · 2020-03-18T15:45:01Z

templates/terraform/post_create/source_repo_repository_update.go.erb

@@ -2,4 +2,10 @@ if v, ok := d.GetOkExists("pubsub_configs"); !isEmptyValue(reflect.ValueOf(pubsu
 	log.Printf("[DEBUG] Calling update after create to patch in pubsub_configs")


I think this file inadvertently got modified, can you revert the changes?

products/oslogin/api.yaml

products/oslogin/terraform.yaml

provider/terraform/examples.rb

modular-magician · 2020-03-18T21:59:51Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 9 files changed, 604 insertions(+), 10 deletions(-))
Terraform Beta: Diff ( 9 files changed, 604 insertions(+), 10 deletions(-))
TF Conversion: Diff ( 2 files changed, 67 insertions(+))
TF OiCS: Diff ( 4 files changed, 108 insertions(+))

Co-Authored-By: Riley Karson <[email protected]>

modular-magician · 2020-03-18T22:02:15Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 9 files changed, 604 insertions(+), 10 deletions(-))
Terraform Beta: Diff ( 9 files changed, 604 insertions(+), 10 deletions(-))
TF Conversion: Diff ( 2 files changed, 67 insertions(+))
TF OiCS: Diff ( 4 files changed, 108 insertions(+))

modular-magician · 2020-03-18T22:06:12Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 9 files changed, 604 insertions(+), 10 deletions(-))
Terraform Beta: Diff ( 9 files changed, 604 insertions(+), 10 deletions(-))
TF Conversion: Diff ( 2 files changed, 67 insertions(+))
TF OiCS: Diff ( 4 files changed, 108 insertions(+))

sebglon · 2020-04-01T10:10:27Z

@rileykarson can i have a status of the review?
This lock a project on my firm.

rileykarson

Sorry! I didn't seem to have gotten the notification from your last update. Looks good, just one small thing- can you add the resource to the sidebar? It'll be a single-resource product similar to https://github.com/GoogleCloudPlatform/magic-modules/blob/master/third_party/terraform/website-compiled/google.erb#L289-L295, with most of the values drawn from https://github.com/modular-magician/terraform-provider-google/compare/auto-pr-3221-old..auto-pr-3221#diff-4781117125c62204e8a4e030cc2ef7f0R15-R20.

modular-magician · 2020-04-01T20:32:59Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 10 files changed, 612 insertions(+), 10 deletions(-))
Terraform Beta: Diff ( 10 files changed, 612 insertions(+), 10 deletions(-))
TF Conversion: Diff ( 2 files changed, 67 insertions(+))
TF OiCS: Diff ( 4 files changed, 108 insertions(+))

rileykarson

LGTM. Thanks for your contribution!

* init os-login sshkey Signed-off-by: Sébastien GLON <[email protected]> * Fix naming + example * Fix endpoint * clean build folder * Apply suggestions from code review Co-Authored-By: Riley Karson <[email protected]> * Fix review * Add post_create * Add reference doc * Try to put user on url request * Fix user * Get the default userinfo email * Update products/oslogin/api.yaml Co-Authored-By: Riley Karson <[email protected]> * Apply suggestions from code review * revert url_param_only * creation fixed * Work except import * Add id_format and import_format * Add Id * Fix id * Update source_repo_repository_update.go.erb * Update source_repo_repository_update.go.erb * revert * Apply suggestions from code review Co-Authored-By: Riley Karson <[email protected]> * Add sidebar link Co-authored-by: Sébastien GLON <[email protected]> Co-authored-by: Riley Karson <[email protected]>

googlebot added the cla: yes label Mar 5, 2020

modular-magician added the community label Mar 5, 2020

rileykarson reviewed Mar 5, 2020

View reviewed changes

sebglon mentioned this pull request Mar 6, 2020

Can we have an attribute or resource to add ssh key of service-account on os-login hashicorp/terraform-provider-google#5389

Closed

rileykarson reviewed Mar 6, 2020

View reviewed changes

products/oslogin/api.yaml Show resolved Hide resolved

products/oslogin/terraform.yaml Outdated Show resolved Hide resolved

templates/terraform/post_create/sshkeyfingerprint.erb Outdated Show resolved Hide resolved

sebglon commented Mar 6, 2020

View reviewed changes

products/oslogin/terraform.yaml Outdated Show resolved Hide resolved

rileykarson reviewed Mar 9, 2020

View reviewed changes

products/oslogin/api.yaml Show resolved Hide resolved

rileykarson reviewed Mar 17, 2020

View reviewed changes

templates/terraform/post_create/sshkeyfingerprint.go.erb Show resolved Hide resolved

products/oslogin/api.yaml Show resolved Hide resolved

Sébastien GLON and others added 7 commits March 18, 2020 10:52

Update products/oslogin/api.yaml

3074428

Co-Authored-By: Riley Karson <[email protected]>

Apply suggestions from code review

efb934e

revert url_param_only

7ed6956

creation fixed

65a3c3b

Work except import

54ac98d

Add id_format and import_format

2eefa45

Add Id

ac109b2

Fix id

abf9470

rileykarson reviewed Mar 18, 2020

View reviewed changes

Sébastien GLON and others added 3 commits March 18, 2020 22:54

Update source_repo_repository_update.go.erb

412449d

Update source_repo_repository_update.go.erb

87c141a

revert

36ed360

Apply suggestions from code review

858b08d

Co-Authored-By: Riley Karson <[email protected]>

rileykarson reviewed Apr 1, 2020

View reviewed changes

Add sidebar link

1237c2b

rileykarson approved these changes Apr 1, 2020

View reviewed changes

rileykarson merged commit 03d8887 into GoogleCloudPlatform:master Apr 1, 2020

		@@ -2,4 +2,10 @@ if v, ok := d.GetOkExists("pubsub_configs"); !isEmptyValue(reflect.ValueOf(pubsu
		log.Printf("[DEBUG] Calling update after create to patch in pubsub_configs")

init os-login sshkey #3221

init os-login sshkey #3221

Conversation

sebglon commented Mar 5, 2020 • edited by rileykarson Loading

modular-magician commented Mar 5, 2020

modular-magician commented Mar 5, 2020

Diff report:

modular-magician commented Mar 5, 2020

Diff report:

modular-magician commented Mar 5, 2020

Diff report:

rileykarson left a comment

Choose a reason for hiding this comment

sebglon commented Mar 5, 2020 • edited Loading

modular-magician commented Mar 5, 2020

Diff report:

modular-magician commented Mar 5, 2020

Diff report:

rileykarson commented Mar 5, 2020 • edited Loading

modular-magician commented Mar 5, 2020

Diff report:

modular-magician commented Mar 5, 2020

Diff report:

modular-magician commented Mar 5, 2020

Diff report:

sebglon commented Mar 5, 2020

rileykarson commented Mar 5, 2020

modular-magician commented Mar 6, 2020

Diff report:

sebglon commented Mar 6, 2020

modular-magician commented Mar 6, 2020

Diff report:

modular-magician commented Mar 6, 2020

Diff report:

modular-magician commented Mar 6, 2020

Diff report:

modular-magician commented Mar 6, 2020

Diff report:

modular-magician commented Mar 9, 2020

Diff report:

sebglon commented Mar 9, 2020 • edited Loading

modular-magician commented Mar 11, 2020

Diff report:

modular-magician commented Mar 18, 2020

Diff report:

sebglon commented Mar 18, 2020

modular-magician commented Mar 18, 2020

Diff report:

rileykarson left a comment

Choose a reason for hiding this comment

rileykarson Mar 18, 2020

Choose a reason for hiding this comment

modular-magician commented Mar 18, 2020

Diff report:

modular-magician commented Mar 18, 2020

Diff report:

modular-magician commented Mar 18, 2020

Diff report:

sebglon commented Apr 1, 2020

rileykarson left a comment

Choose a reason for hiding this comment

modular-magician commented Apr 1, 2020

Diff report:

rileykarson left a comment

Choose a reason for hiding this comment

sebglon commented Mar 5, 2020 •

edited by rileykarson

Loading

sebglon commented Mar 5, 2020 •

edited

Loading

rileykarson commented Mar 5, 2020 •

edited

Loading

sebglon commented Mar 9, 2020 •

edited

Loading