Merge pull request #60 from slr71/multiyear-subscriptions

CORE-1983: multiyear subscriptions.

.github/workflows/build-prerelease.yml

@@ -10,17 +10,17 @@ jobs:
     steps:
     - name: Checkout Repo
       id: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Harbor Login
       id: harbor_login
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         registry: harbor.cyverse.org
         username: ${{ secrets.HARBOR_USERNAME }}
         password: ${{ secrets.HARBOR_PASSWORD }}
     - name: Install Kubernetes Tools
       id: install_k8s_tools
-      uses: yokawasa/action-setup-kube-tools@v0.9.2
+      uses: yokawasa/action-setup-kube-tools@v0.10.0
     - name: Build Docker images
       id: build
       run: |

.github/workflows/build-release.yml

@@ -10,17 +10,17 @@ jobs:
     steps:
     - name: Checkout Repo
       id: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Harbor Login
       id: harbor_login
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         registry: harbor.cyverse.org
         username: ${{ secrets.HARBOR_USERNAME }}
         password: ${{ secrets.HARBOR_PASSWORD }}
     - name: Install Kubernetes Tools
       id: install_k8s_tools
-      uses: yokawasa/action-setup-kube-tools@v0.9.2
+      uses: yokawasa/action-setup-kube-tools@v0.10.0
     - name: Build Docker images
       id: build
       run: |

.github/workflows/golangci-lint.yml

@@ -16,18 +16,18 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.19'
+          go-version: '1.21'
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
           # Require: The version of golangci-lint to use.
           # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
           # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
-          version: v1.53
+          version: v1.54
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.19
+FROM golang:1.21
 
 RUN go install github.com/jstemmer/go-junit-report@latest
 

go.mod

@@ -1,88 +1,96 @@
 module github.com/cyverse/QMS
 
-go 1.18
+go 1.21
 
 require (
 	github.com/cyverse-de/echo-middleware/v2 v2.0.2
-	github.com/labstack/gommon v0.3.1 // indirect
+	github.com/labstack/gommon v0.4.2 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/sirupsen/logrus v1.8.1
-	gorm.io/driver/postgres v1.3.5
-	gorm.io/gorm v1.23.5
+	github.com/sirupsen/logrus v1.9.3
+	gorm.io/driver/postgres v1.5.6
+	gorm.io/gorm v1.25.7
 )
 
 require (
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.12.1 // indirect
+	github.com/jackc/pgconn v1.14.1 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.3.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
-	github.com/jackc/pgtype v1.11.0 // indirect
-	github.com/jackc/pgx/v4 v4.16.1 // indirect
+	github.com/jackc/pgproto3/v2 v2.3.2 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
+	github.com/jackc/pgtype v1.14.2 // indirect
+	github.com/jackc/pgx/v4 v4.18.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.1 // indirect
-	golang.org/x/net v0.0.0-20220516155154-20f960328961 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	github.com/valyala/fasttemplate v1.2.2 // indirect
+	golang.org/x/net v0.21.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 )
 
 require (
 	github.com/cyverse-de/dbutil v1.0.1
-	github.com/lib/pq v1.10.6
-	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
-	golang.org/x/sys v0.0.0-20220614162138-6c1b26c55098 // indirect
+	github.com/lib/pq v1.10.9
+	golang.org/x/crypto v0.19.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
 )
 
 require (
 	github.com/cyverse-de/go-mod/cfg v0.0.1
 	github.com/cyverse-de/go-mod/logging v0.0.2
 	github.com/cyverse-de/go-mod/otelutils v0.0.3
-	github.com/cyverse-de/go-mod/pbinit v0.0.3
+	github.com/cyverse-de/go-mod/pbinit v0.1.11
 	github.com/cyverse-de/go-mod/protobufjson v0.0.3
-	github.com/cyverse-de/p/go/qms v0.0.7
-	github.com/golang-migrate/migrate/v4 v4.15.2
-	github.com/knadh/koanf v1.4.1
-	github.com/labstack/echo/v4 v4.7.2
+	github.com/cyverse-de/p/go/qms v0.1.10
+	github.com/go-playground/validator/v10 v10.18.0
+	github.com/golang-migrate/migrate/v4 v4.17.0
+	github.com/knadh/koanf v1.5.0
+	github.com/labstack/echo/v4 v4.11.4
 	github.com/spirosoik/echo-logrus v1.0.0
-	github.com/uptrace/opentelemetry-go-extra/otelgorm v0.1.13
-	go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.32.0
+	github.com/uptrace/opentelemetry-go-extra/otelgorm v0.2.3
+	go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.48.0
 )
 
 require (
-	github.com/cyverse-de/go-mod/gotelnats v0.0.10 // indirect
-	github.com/cyverse-de/p/go/header v0.0.1 // indirect
-	github.com/cyverse-de/p/go/svcerror v0.0.5 // indirect
-	github.com/fsnotify/fsnotify v1.4.9 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/cyverse-de/go-mod/gotelnats v0.0.11 // indirect
+	github.com/cyverse-de/p/go/analysis v0.0.15 // indirect
+	github.com/cyverse-de/p/go/header v0.0.3 // indirect
+	github.com/cyverse-de/p/go/monitoring v0.0.4 // indirect
+	github.com/cyverse-de/p/go/svcerror v0.0.7 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-playground/locales v0.14.0 // indirect
-	github.com/go-playground/universal-translator v0.18.0 // indirect
-	github.com/go-playground/validator/v10 v10.11.0 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/joho/godotenv v1.3.0 // indirect
-	github.com/leodido/go-urn v1.2.1 // indirect
-	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/jackc/pgx/v5 v5.5.3 // indirect
+	github.com/jackc/puddle/v2 v2.2.1 // indirect
+	github.com/joho/godotenv v1.5.1 // indirect
+	github.com/klauspost/compress v1.17.6 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
-	github.com/mitchellh/mapstructure v1.4.1 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/nats-io/nats.go v1.16.0 // indirect
-	github.com/nats-io/nkeys v0.3.0 // indirect
+	github.com/nats-io/nats.go v1.32.0 // indirect
+	github.com/nats-io/nkeys v0.4.7 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
-	github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.13 // indirect
-	go.opentelemetry.io/otel v1.7.0 // indirect
-	go.opentelemetry.io/otel/exporters/jaeger v1.7.0 // indirect
-	go.opentelemetry.io/otel/metric v0.30.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.7.0 // indirect
-	go.opentelemetry.io/otel/trace v1.7.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
+	github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.3 // indirect
+	go.opentelemetry.io/otel v1.23.1 // indirect
+	go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
+	go.opentelemetry.io/otel/metric v1.23.1 // indirect
+	go.opentelemetry.io/otel/sdk v1.23.1 // indirect
+	go.opentelemetry.io/otel/trace v1.23.1 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	golang.org/x/sync v0.6.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )