Merge pull request #13 from synackd/postgres-one-db

Add bss-init to initialize Postgres DB

.github/workflows/build_release.yml

@@ -52,13 +52,17 @@ jobs:
           echo "fs.writeFileSync('digest.txt', firstNonNullDigest);" >> process.js
           node process.js
           echo "digest=$(cat digest.txt)" >> $GITHUB_OUTPUT
-      - name: Attest Binaries
+      - name: Attest boot-script-service binary
         uses: github-early-access/generate-build-provenance@main
         with:
           subject-path: dist/boot-script-service
+      - name: Attest bss-init binary
+        uses: github-early-access/generate-build-provenance@main
+        with:
+          subject-path: dist/bss-init
       - name: generate build provenance
         uses: github-early-access/generate-build-provenance@main
         with:
           subject-name: ghcr.io/openchami/bss
           subject-digest: ${{ steps.process_goreleaser_output.outputs.digest }}
-          push-to-registry: true
+          push-to-registry: true

.github/workflows/unit_test.yaml

@@ -5,7 +5,7 @@
       build:
         defaults:
           run:
-            working-directory: ./cmd/boot-script-service
+            working-directory: ./cmd
         runs-on: ubuntu-latest
 
         steps:
@@ -15,7 +15,6 @@
             with:
               go-version: '1.21.x'
           - name: Install dependencies
-            run: go get .
+            run: go get ./boot-script-service ./bss-init
           - name: Test with the Go CLI
-            run: go test
-
+            run: go test ./boot-script-service ./bss-init

.goreleaser.yaml

@@ -18,6 +18,16 @@ builds:
     no_unique_dist_dir: true
     tags:
       - dynamic
+  - id: bss-init
+    main: ./cmd/bss-init
+    binary: bss-init
+    goos:
+      - linux
+    goarch:
+      - amd64
+    no_unique_dist_dir: true
+    tags:
+      - dynamic
 
 dockers:
   - 
@@ -37,6 +47,7 @@ dockers:
       - CHANGELOG.md
       - README.md
       - .version
+      - migrations/
 
 archives:
   - format: tar.gz

CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.28.0] - 2024-01-24
+
+- Added bss-init and postgres migrations
+- Moved postgres init code from boot-script-service to bss-init
+- Updated docker-compose postgres and bss-debugger files to use one postgres container
+- Updated go.mod:
+  * Fixed grpc version at v1.29.1 to fix dependency conflict
+  * Added github.com/golang-migrate/migrate v4.16.2
+
 ## [1.27.2] - 2024-01-19
 
 - Added postgres backend

Dockerfile

@@ -52,8 +52,10 @@ RUN set -ex \
     && apk -U upgrade \
     && apk add --no-cache curl
 
-# Get the boot-script-service from the builder stage.
+# Get the boot-script-service and bss-init from the builder stage.
 COPY boot-script-service /usr/local/bin/
+COPY bss-init /usr/local/bin/
+COPY migrations/* /migrations/
 COPY .version /
 
 # nobody 65534:65534

Makefile

@@ -23,7 +23,7 @@
 # Service
 NAME ?= bss
 VERSION ?= $(shell cat .version)
-BINARIES = boot-script-service
+BINARIES = boot-script-service bss-init
 
 
 all : image unittest ct snyk ct_image

cmd/boot-script-service/main.go

@@ -473,12 +473,6 @@ func main() {
 			log.Fatalf("Access to Postgres database at %s:%d failed: %v\n", sqlHost, sqlPort, err)
 		}
 		defer sqlClose()
-
-		// Create database and tables (if they do not exist).
-		err = bssdb.CreateDB(bssdbName)
-		if err != nil {
-			log.Fatalf("Creating Postgres database %q and tables failed: %v\n", bssdbName, err)
-		}
 	} else {
 		err = kvOpen(datastoreBase, svcOpts, kvRetryCount, kvRetryWait)
 		if err != nil {