Skip to content

Commit

Permalink
Use the registry version of the slack integration (#101)
Browse files Browse the repository at this point in the history
The PRs I proposed earlier today have already been merged upstream and a release has been cut :-)

Also used my new friend `terraform fmt` on the module while we're updating it.
  • Loading branch information
mhutchinson authored Feb 21, 2024
1 parent 61aa7cb commit a017b5e
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions deployment/modules/cloudbuild/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ terraform {

resource "google_artifact_registry_repository" "distributor_docker" {
repository_id = "distributor-docker-${var.env}"
location = var.region
location = var.region
description = "docker images for the distributor"
format = "DOCKER"
}
Expand Down Expand Up @@ -64,7 +64,7 @@ resource "google_cloudbuild_trigger" "distributor_docker" {
step {
name = "gcr.io/google.com/cloudsdktool/cloud-sdk"
entrypoint = "gcloud"
args = [
args = [
"run",
"deploy",
var.cloud_run_service,
Expand Down Expand Up @@ -110,16 +110,12 @@ resource "google_project_iam_member" "cloudrun_deployer" {
}

module "cloud-build-slack-notifier" {
# This should be set back to the registry version when the following are merged:
# https://github.com/simplifi/terraform-google-cloud-build-slack-notifier/pull/8
# https://github.com/simplifi/terraform-google-cloud-build-slack-notifier/pull/9
source = "github.com/mhutchinson/terraform-google-cloud-build-slack-notifier?ref=4e525d3"
# source = "simplifi/cloud-build-slack-notifier/google"
# version = "0.3.0"
source = "simplifi/cloud-build-slack-notifier/google"
version = "0.4.0"

name = "gcp-slack-${var.env}"
project_id = var.project_id

# https://api.slack.com/apps/A06KYD43DPE/incoming-webhooks
slack_webhook_url_secret_id = "gcb_slack_webhook_${var.env}"
slack_webhook_url_secret_project = var.project_id
Expand Down

0 comments on commit a017b5e

Please sign in to comment.