Skip to content

Commit 93c7414

Browse files
authored
gcp-sa-provisioning corrections regarding issue #168 (#169)
* Update README.md * Update README.md * Correct spelling of module gcp-sa-provisioning to match example script * Correct service_account value * Rename module reference to not overlap with gcp-basic * Provider further documentation that dashes or underscores in the prefix variable will cause deployment errors * Whitespace * Update README.md
1 parent 290ab78 commit 93c7414

File tree

11 files changed

+12
-17
lines changed

11 files changed

+12
-17
lines changed

Diff for: examples/gcp-sa-provisionning/README.md renamed to examples/gcp-sa-provisioning/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ In this template, we create a [Service Account](https://cloud.google.com/iam/doc
1212

1313
- The built-in roles of Kubernetes Admin and Compute Storage Admin needs to be available
1414

15-
- you need to run `glcoud auth application-default login` and login with your google account
15+
- you need to run `gcloud auth application-default login` and login with your google account
1616

1717
## Run as an SA
1818

19-
You can do the same thing by provisionning a service account that will have the same permissions - and associate the key associated to it.
19+
You can do the same thing by provisioning a service account that will have the same permissions - and associate the key associated to it.
2020

2121

22-
## Run the tempalte
22+
## Run the template
2323

2424
- You need to fill in the variables.tf
2525
- run `terraform init`
File renamed without changes.

Diff for: examples/gcp-sa-provisionning/main.tf renamed to examples/gcp-sa-provisioning/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module "gcp-basic" {
1+
module "gcp-sa-provisioning" {
22
source = "github.com/databricks/terraform-databricks-examples/modules/gcp-sa-provisioning"
33
google_project = var.google_project
44
prefix = var.prefix

Diff for: examples/gcp-sa-provisioning/outputs.tf

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
output "service_account" {
2+
value = module.gcp-sa-provisioning.service_account
3+
description = "Add this email as a user in the Databricks account console"
4+
}

Diff for: examples/gcp-sa-provisionning/variables.tf renamed to examples/gcp-sa-provisioning/variables.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ variable "google_project" {
55

66
variable "prefix" {
77
type = string
8-
description = "Prefix to use in generated service account name"
8+
description = "Prefix to use in generated service account name. This should not contain underscores or dashes."
99
}
1010

1111
variable "delegate_from" {

Diff for: examples/gcp-sa-provisionning/outputs.tf

-8
This file was deleted.

Diff for: modules/gcp-sa-provisionning/README.md renamed to modules/gcp-sa-provisioning/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
sa provisionning
1+
# Provisioning a Google Service Account that can be used to deploy Databricks workspace on GCP
22
=========================
33

44
In this template, we show how to deploy a service account that can be used to deploy gcp workspaces.
@@ -12,11 +12,11 @@ In this template, we create a [Service Account](https://cloud.google.com/iam/doc
1212

1313
- The built-in roles of Kubernetes Admin and Compute Storage Admin needs to be available
1414

15-
- you need to run `glcoud auth application-default login` and login with your google account
15+
- you need to run `gcloud auth application-default login` and login with your google account
1616

1717
## Run as an SA
1818

19-
You can do the same thing by provisionning a service account that will have the same permissions - and associate the key associated to it.
19+
You can do the same thing by provisioning a service account that will have the same permissions - and associate the key associated to it.
2020

2121

2222
## Run the tempalte
File renamed without changes.

Diff for: modules/gcp-sa-provisionning/main.tf renamed to modules/gcp-sa-provisioning/main.tf

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ resource "google_service_account_iam_policy" "impersonatable" {
2020
policy_data = data.google_iam_policy.this.policy_data
2121
}
2222

23-
2423
resource "google_project_iam_custom_role" "workspace_creator" {
2524
role_id = "${var.prefix}_workspace_creator"
2625
title = "Databricks Workspace Creator by Aleks"
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)