Skip to content

Commit

Permalink
Merge branch 'main' into tmacdonald/GROW-2760/codefresh-migration
Browse files Browse the repository at this point in the history
  • Loading branch information
tmac1973 authored Mar 19, 2024
2 parents 737ac23 + 78515be commit c9714b4
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ name: Release

on:
workflow_dispatch:

# push:
# tags:
# - 'v*'


jobs:
call-release:
uses: lacework/oss-actions/.github/workflows/tf-release.yml@main
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-compat-pr-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ jobs:
if (result.state != "active" ) {
core.setFailed('Commenter is not a member of the growth team.')
}
call-test-compat:
needs: check-commenting-user
uses: lacework/oss-actions/.github/workflows/tf-test-compatibility.yml@main
secrets: inherit
secrets: inherit

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# v0.5.1


---
# v0.5.0

## Features
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ cloudresourcemanager.googleapis.com
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.1 |
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.4.0, < 5.0.0 |
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.4.0 |
| <a name="requirement_lacework"></a> [lacework](#requirement\_lacework) | ~> 1.18 |
| <a name="requirement_time"></a> [time](#requirement\_time) | ~> 0.6 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.4.0, < 5.0.0 |
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.4.0 |
| <a name="provider_lacework"></a> [lacework](#provider\_lacework) | ~> 1.18 |
| <a name="provider_random"></a> [random](#provider\_random) | n/a |
| <a name="provider_time"></a> [time](#provider\_time) | ~> 0.6 |
Expand All @@ -57,7 +57,7 @@ cloudresourcemanager.googleapis.com

| Name | Source | Version |
|------|--------|---------|
| <a name="module_lacework_al_ps_svc_account"></a> [lacework\_al\_ps\_svc\_account](#module\_lacework\_al\_ps\_svc\_account) | lacework/service-account/gcp | ~> 1.0 |
| <a name="module_lacework_al_ps_svc_account"></a> [lacework\_al\_ps\_svc\_account](#module\_lacework\_al\_ps\_svc\_account) | lacework/service-account/gcp | ~> 2.0 |

## Resources

Expand Down
7 changes: 2 additions & 5 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# Release Notes
Another day, another release. These are the release notes for the version `v0.5.0`.
Another day, another release. These are the release notes for the version `v0.5.1`.


## Features
* feat(GROW-2540): support integration folder customization for inclusion/exclusion (#22) (Matt Cadorette)([a39a097](https://github.com/lacework/terraform-gcp-pub-sub-audit-log/commit/a39a097bee10a64ff620093277c051b376b8ab1d))
## Other Changes
* ci: version bump to v0.4.3-dev (Lacework)([933ce4c](https://github.com/lacework/terraform-gcp-pub-sub-audit-log/commit/933ce4c4dab10e356851d5acb828124cbac89e84))
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.1-dev
0.5.2-dev
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ resource "google_project_service" "required_apis" {

module "lacework_al_ps_svc_account" {
source = "lacework/service-account/gcp"
version = "~> 1.0"
version = "~> 2.0"
create = var.use_existing_service_account ? false : true
service_account_name = local.service_account_name
project_id = local.project_id
Expand Down
2 changes: 1 addition & 1 deletion versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_version = ">= 0.15.1"

required_providers {
google = ">= 4.4.0, < 5.0.0"
google = ">= 4.4.0"
time = "~> 0.6"
lacework = {
source = "lacework/lacework"
Expand Down

0 comments on commit c9714b4

Please sign in to comment.