@hiiretail/gcp-infra-generators 1.7.3 → 1.7.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/generators/common-resources/cloudsql/templates/mysql/instance/terragrunt.hcl +5 -9
- package/dist/generators/common-resources/cloudsql/templates/mysql/instance-secrets/terragrunt.hcl +4 -0
- package/dist/node_modules/.package-lock.json +1 -1
- package/dist/package.json +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
# Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
|
|
2
2
|
# working directory, into a temporary folder, and execute your Terraform commands in that folder.
|
|
3
3
|
terraform {
|
|
4
|
-
source = "git::https://github.com/terraform-google-modules/terraform-google-sql-db//modules/mysql?ref=
|
|
4
|
+
source = "git::https://github.com/terraform-google-modules/terraform-google-sql-db//modules/mysql?ref=v21.0.0"
|
|
5
5
|
}
|
|
6
6
|
|
|
7
7
|
# Include all settings from the root terragrunt.hcl file
|
|
@@ -10,14 +10,13 @@ include {
|
|
|
10
10
|
}
|
|
11
11
|
|
|
12
12
|
locals {
|
|
13
|
-
spec_vars
|
|
14
|
-
project_vars
|
|
15
|
-
common_vars
|
|
13
|
+
spec_vars = read_terragrunt_config("${get_terragrunt_dir()}/spec.hcl")
|
|
14
|
+
project_vars = read_terragrunt_config(find_in_parent_folders("project.hcl"))
|
|
15
|
+
common_vars = read_terragrunt_config(find_in_parent_folders("common.hcl"))
|
|
16
16
|
labels = merge(local.common_vars.locals.default_user_labels, local.project_vars.locals.default_user_labels, {
|
|
17
17
|
component = local.common_vars.locals.component
|
|
18
18
|
product = local.common_vars.locals.product
|
|
19
19
|
tenant-alias = local.common_vars.locals.tenant_alias
|
|
20
|
-
terraform = ""
|
|
21
20
|
})
|
|
22
21
|
}
|
|
23
22
|
|
|
@@ -26,15 +25,12 @@ inputs = merge(
|
|
|
26
25
|
local.spec_vars.locals,
|
|
27
26
|
{
|
|
28
27
|
name = "mysql-${local.project_vars.locals.project_name}-clan"
|
|
29
|
-
project_id = local.project_vars.locals.project_id
|
|
30
28
|
ip_configuration = {
|
|
31
29
|
"authorized_networks" : [],
|
|
32
30
|
"ipv4_enabled" : true,
|
|
33
31
|
"private_network" : "https://www.googleapis.com/compute/v1/projects/${local.project_vars.locals.project_id}/global/networks/${local.project_vars.locals.clan_network}",
|
|
34
|
-
"
|
|
32
|
+
"ssl_mode" : "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
|
|
35
33
|
}
|
|
36
|
-
## Uncomment and apply it before destroy in case of necessary to delete the instance
|
|
37
|
-
# deletion_protection = false
|
|
38
34
|
user_labels = local.labels,
|
|
39
35
|
}
|
|
40
36
|
)
|
package/dist/generators/common-resources/cloudsql/templates/mysql/instance-secrets/terragrunt.hcl
CHANGED
|
@@ -24,6 +24,8 @@ dependency "instance" {
|
|
|
24
24
|
mock_outputs = {
|
|
25
25
|
private_ip_address = "dummy-ip"
|
|
26
26
|
generated_user_password = "dummy-password"
|
|
27
|
+
public_ip_address = "dummy-ip"
|
|
28
|
+
private_ip_address = "dummy-ip"
|
|
27
29
|
}
|
|
28
30
|
}
|
|
29
31
|
|
|
@@ -33,6 +35,8 @@ inputs = {
|
|
|
33
35
|
secrets = {
|
|
34
36
|
mysql_master_password = dependency.instance.outputs.generated_user_password
|
|
35
37
|
mysql_private_address = dependency.instance.outputs.private_ip_address
|
|
38
|
+
mysql_public_address = dependency.instance.outputs.public_ip_address
|
|
39
|
+
mysql_address = dependency.instance.outputs.private_ip_address
|
|
36
40
|
}
|
|
37
41
|
labels = local.labels,
|
|
38
42
|
}
|
|
@@ -11528,7 +11528,7 @@
|
|
|
11528
11528
|
},
|
|
11529
11529
|
"packages/generators": {
|
|
11530
11530
|
"name": "@hiiretail/gcp-infra-generators",
|
|
11531
|
-
"version": "1.7.
|
|
11531
|
+
"version": "1.7.4",
|
|
11532
11532
|
"license": "MIT",
|
|
11533
11533
|
"dependencies": {
|
|
11534
11534
|
"@google-cloud/storage": "^7.18.0",
|
package/dist/package.json
CHANGED