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

fix: Bump google-project-factory to ~> 17.0 for compatibility with google provider #235

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ resource "google_redis_instance" "default" {

module "enable_apis" {
source = "terraform-google-modules/project-factory/google//modules/project_services"
version = "~> 15.0"
version = "~> 17.0"

project_id = var.project
enable_apis = var.enable_apis
Expand Down
43 changes: 9 additions & 34 deletions metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
version: 11.0.0
actuationTool:
flavor: Terraform
version: ">= 0.13"
version: ">= 1.3"
description: {}
content:
subBlueprints:
Expand Down Expand Up @@ -59,11 +59,11 @@ spec:
description: The full name of the Google Compute Engine network to which the instance is connected. If left unspecified, the default network will be used.
varType: string
connections:
- source:
source: github.com/terraform-google-modules/terraform-google-network//modules/vpc
version: v9.1.0
spec:
outputExpr: network_name
- source:
source: github.com/terraform-google-modules/terraform-google-network//modules/vpc
version: v9.1.0
spec:
outputExpr: network_name
- name: connect_mode
description: The connection mode of the Redis instance. Can be either DIRECT_PEERING or PRIVATE_SERVICE_ACCESS. The default connect mode if not provided is DIRECT_PEERING.
varType: string
Expand Down Expand Up @@ -148,52 +148,24 @@ spec:
outputs:
- name: auth_string
description: AUTH String set on the instance. This field will only be populated if auth_enabled is true.
type: string
- name: current_location_id
description: The current zone where the Redis endpoint is placed.
type: string
- name: env_vars
description: Exported environment variables
type: [
"object",
{
"REDIS_HOST": "string",
"REDIS_PORT": "number"
}
]
- name: host
description: The IP address of the instance.
type: string
- name: id
description: The memorystore instance ID.
type: string
- name: persistence_iam_identity
description: Cloud IAM identity used by import/export operations. Format is 'serviceAccount:'. May change over time
type: string
- name: port
description: The port number of the exposed Redis endpoint.
type: number
- name: read_endpoint
description: " The IP address of the exposed readonly Redis endpoint."
type: string
- name: region
description: The region the instance lives in.
type: string
- name: server_ca_certs
description: List of server CA certificates for the instance
type: [
"list",
[
"object",
{
"cert": "string",
"create_time": "string",
"expire_time": "string",
"serial_number": "string",
"sha1_fingerprint": "string"
}
]
]
requirements:
roles:
- level: Project
Expand All @@ -207,3 +179,6 @@ spec:
- serviceconsumermanagement.googleapis.com
- networkconnectivity.googleapis.com
- compute.googleapis.com
providerVersions:
- source: hashicorp/google
version: ">= 4.74.0, < 7"
5 changes: 4 additions & 1 deletion modules/memcache/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
version: 11.0.0
actuationTool:
flavor: Terraform
version: ">= 0.13"
version: ">= 1.3"
description: {}
content:
examples:
Expand Down Expand Up @@ -126,3 +126,6 @@ spec:
- serviceconsumermanagement.googleapis.com
- networkconnectivity.googleapis.com
- compute.googleapis.com
providerVersions:
- source: hashicorp/google
version: ">= 4.74.0, < 7"
7 changes: 7 additions & 0 deletions modules/redis-cluster/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ spec:
description: "The authorization mode of the Redis cluster. If not provided, auth feature is disabled for the cluster. Default value is AUTH_MODE_DISABLED. Possible values are: AUTH_MODE_UNSPECIFIED, AUTH_MODE_IAM_AUTH, AUTH_MODE_DISABLED"
varType: string
defaultValue: AUTH_MODE_DISABLED
- name: deletion_protection_enabled
description: " Indicates if the cluster is deletion protected or not. If the value if set to true, any delete cluster operation will fail. Default value is true"
varType: bool
defaultValue: true
- name: enable_apis
description: Flag for enabling memcache.googleapis.com in your project
varType: bool
Expand Down Expand Up @@ -135,3 +139,6 @@ spec:
- serviceconsumermanagement.googleapis.com
- networkconnectivity.googleapis.com
- compute.googleapis.com
providerVersions:
- source: hashicorp/google
version: ">= 4.74.0, < 7"