diff --git a/.github/workflows/cloud-run-deploy.yaml b/.github/workflows/cloud-run-deploy.yaml index e57c493..d2a9a14 100644 --- a/.github/workflows/cloud-run-deploy.yaml +++ b/.github/workflows/cloud-run-deploy.yaml @@ -19,7 +19,7 @@ on: description: 'The name of the Cloud Run service to deploy to' required: true type: string - default: 'dpgraham-api' + default: 'dpgraham-server' env: PROJECT_ID: ${{ vars.PROJECT_ID }} diff --git a/.run/Run.run.xml b/.run/Run.run.xml index 5ccd619..e7d2ab8 100644 --- a/.run/Run.run.xml +++ b/.run/Run.run.xml @@ -5,13 +5,11 @@ - + - - + \ No newline at end of file diff --git a/db/db.go b/db/db.go index 0c4f01e..e41a448 100644 --- a/db/db.go +++ b/db/db.go @@ -91,7 +91,19 @@ func (a *ArticleStore) All() ([]models.Article, error) { func (a *ArticleStore) ByID(id int) (models.Article, error) { article := models.Article{} - err := a.DB.QueryRow("SELECT * FROM articles WHERE id = $1", id).Scan( + err := a.DB.QueryRow( + `SELECT + id, + to_char(created_date, 'mm/dd/yyyy'), + to_char(updated_date, 'mm/dd/yyyy'), + content, + published, + title, + author + FROM + articles + WHERE + id = $1`, id).Scan( &article.Id, &article.CreatedDate, &article.LastUpdate, &article.Content, &article.Published, &article.Title, &article.Author) if err != nil { diff --git a/infra/modules/cloud-run/main.tf b/infra/modules/cloud-run/main.tf index 33bc6db..d4a6303 100644 --- a/infra/modules/cloud-run/main.tf +++ b/infra/modules/cloud-run/main.tf @@ -1,6 +1,9 @@ resource "google_cloud_run_v2_service" "default" { name = var.name location = var.region + lifecycle { + ignore_changes = [template, client, client_version, labels] + } template { containers {