Skip to content

Commit

Permalink
Remove testing pieces and clean up, fmt, etc.
Browse files Browse the repository at this point in the history
  • Loading branch information
mdragon committed Nov 20, 2024
1 parent b7d275f commit e5ffa6d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/cd-metabase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ name: Deploy Metabase
run-name: Deploy ${{ github.ref_name }} to Metabase ${{ inputs.environment || (github.event_name == 'release' && 'prod') || 'nonprod'}}

on:
push:
branches:
- "mdragon/2938-metabase-workflow"
paths:
- ".github/workflows/cd-metabase.yml"
- "Makefile"
workflow_dispatch:
inputs:
environment:
Expand All @@ -34,5 +28,5 @@ jobs:
matrix:
envs: ${{ github.event_name == 'release' && fromJSON('["prod"]') || github.ref_name == 'main' && fromJSON('["dev", "staging"]') || fromJSON('["dev"]') }}
with:
version: latest
version: ${{ inputs.image-tag }}
environment: ${{ matrix.envs }}
6 changes: 0 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,3 @@ release-image-tag: ## Prints the image tag of the release image

help: ## Prints the help documentation and info about each command
@grep -E '^[/a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'






4 changes: 2 additions & 2 deletions infra/analytics/metabase/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ module "service" {

extra_environment_variables = merge(local.service_config.extra_environment_variables, {
ENVIRONMENT = var.environment_name
MB_DB_PORT = data.aws_rds_cluster.db_cluster.port
MB_DB_HOST = data.aws_rds_cluster.db_cluster.endpoint
MB_DB_PORT = data.aws_rds_cluster.db_cluster.port
MB_DB_HOST = data.aws_rds_cluster.db_cluster.endpoint
})

secrets = concat(
Expand Down

0 comments on commit e5ffa6d

Please sign in to comment.