Skip to content

Commit

Permalink
Merge branch 'main' into display-metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
q2w authored Jan 15, 2025
2 parents 5aa2792 + 6338209 commit 32b19e8
Show file tree
Hide file tree
Showing 14 changed files with 28 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/conventional-commit-lint.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022-2023 Google LLC
# Copyright 2022-2025 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
# limitations under the License.

# NOTE: This file is automatically generated from:
# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/github
# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/github

enabled: true
always_check_pr_title: true
4 changes: 2 additions & 2 deletions .github/trusted-contribution.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2023 Google LLC
# Copyright 2023-2025 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
# limitations under the License.

# NOTE: This file is automatically generated from:
# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/github
# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/github

annotations:
- type: comment
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2023 Google LLC
# Copyright 2023-2025 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -13,15 +13,15 @@
# limitations under the License.

# NOTE: This file is automatically generated from values at:
# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/org/locals.tf
# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/org/locals.tf

name: 'lint'

on:
workflow_dispatch:
pull_request:
branches:
- master
- main

concurrency:
group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022-2024 Google LLC
# Copyright 2022-2025 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
# limitations under the License.

# NOTE: This file is automatically generated from:
# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/github
# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/github

name: "Close stale issues"
on:
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this
project adheres to [Semantic Versioning](http://semver.org/).

## [13.0.1](https://github.com/terraform-google-modules/terraform-google-memorystore/compare/v13.0.0...v13.0.1) (2025-01-04)


### Bug Fixes

* use less privilege roles for ci service account ([#264](https://github.com/terraform-google-modules/terraform-google-memorystore/issues/264)) ([36c20c0](https://github.com/terraform-google-modules/terraform-google-memorystore/commit/36c20c0cf1581e32a2fcba29f5dae6301cafc3d4))

## [13.0.0](https://github.com/terraform-google-modules/terraform-google-memorystore/compare/v12.0.1...v13.0.0) (2024-12-17)


Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# NOTE: This file is automatically generated from values at:
# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/org/locals.tf
# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/org/locals.tf

* @terraform-google-modules/cft-admins @imrannayer @q2w

Expand Down
2 changes: 1 addition & 1 deletion metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
source:
repo: https://github.com/terraform-google-modules/terraform-google-memorystore.git
sourceType: git
version: 13.0.0
version: 13.0.1
actuationTool:
flavor: Terraform
version: ">= 1.3"
Expand Down
2 changes: 1 addition & 1 deletion modules/memcache/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
repo: https://github.com/terraform-google-modules/terraform-google-memorystore.git
sourceType: git
dir: /modules/memcache
version: 13.0.0
version: 13.0.1
actuationTool:
flavor: Terraform
version: ">= 1.3"
Expand Down
4 changes: 2 additions & 2 deletions modules/memcache/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-google-memorystore:memcache/v13.0.0"
module_name = "blueprints/terraform/terraform-google-memorystore:memcache/v13.0.1"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-google-memorystore:memcache/v13.0.0"
module_name = "blueprints/terraform/terraform-google-memorystore:memcache/v13.0.1"
}

}
2 changes: 1 addition & 1 deletion modules/redis-cluster/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
repo: https://github.com/terraform-google-modules/terraform-google-memorystore.git
sourceType: git
dir: /modules/redis-cluster
version: 13.0.0
version: 13.0.1
actuationTool:
flavor: Terraform
version: ">= 1.3"
Expand Down
4 changes: 2 additions & 2 deletions modules/redis-cluster/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-google-memorystore:redis-cluster/v13.0.0"
module_name = "blueprints/terraform/terraform-google-memorystore:redis-cluster/v13.0.1"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-google-memorystore:redis-cluster/v13.0.0"
module_name = "blueprints/terraform/terraform-google-memorystore:redis-cluster/v13.0.1"
}

}
2 changes: 1 addition & 1 deletion modules/valkey/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
repo: https://github.com/terraform-google-modules/terraform-google-memorystore.git
sourceType: git
dir: /modules/valkey
version: 13.0.0
version: 13.0.1
actuationTool:
flavor: Terraform
version: ">= 1.3"
Expand Down
4 changes: 2 additions & 2 deletions modules/valkey/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-google-memorystore:valkey/v13.0.0"
module_name = "blueprints/terraform/terraform-google-memorystore:valkey/v13.0.1"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-google-memorystore:valkey/v13.0.0"
module_name = "blueprints/terraform/terraform-google-memorystore:valkey/v13.0.1"
}

}
2 changes: 1 addition & 1 deletion versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-google-memorystore/v13.0.0"
module_name = "blueprints/terraform/terraform-google-memorystore/v13.0.1"
}

}

0 comments on commit 32b19e8

Please sign in to comment.