Skip to content

Commit

Permalink
Merge pull request #365 from streamdal/blinktag/fix_version_tag
Browse files Browse the repository at this point in the history 
Fix unset version when building locally
  • Loading branch information
@blinktag
blinktag authored Feb 8, 2024
2 parents 90ee8c8 + ded325f commit 04acb41
Show file tree
Hide file tree
Showing 1,183 changed files with 90,024 additions and 29,243 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/release.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,19 @@ jobs:
run: echo "GITHUB_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Set short sha
run: echo "GITHUB_SHORT_SHA=`git rev-parse --short HEAD`" >> $GITHUB_ENV
- name: Delete tag
uses: prompt/actions-delete-tag@v1
- name: Delete tag local
run: git tag -d ${{ env.GITHUB_TAG }}
- name: Inject version into version.txt
run: |
echo "${{ env.GITHUB_TAG }}-${{ env.GITHUB_SHORT_SHA }}" > version.txt
- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Bumped version in version.txt to ${{ env.GITHUB_TAG }}
branch: master
tagging_message: ${{ env.GITHUB_TAG }}
push_options: '--force'
- name: Build
run: |
VERSION="$GITHUB_TAG-$GITHUB_SHORT_SHA" TELEMETRY_API_KEY="${{secrets.TELEMETRY_API_KEY}}" make build
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION ?= $(shell git rev-parse --short HEAD)
VERSION ?= $(shell cat version.txt)
SHORT_SHA ?= $(shell git rev-parse --short HEAD)
GIT_TAG ?= $(shell git describe --tags --abbrev=0)
BINARY = plumber
Expand Down
5 changes: 3 additions & 2 deletions actions/actions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ import (
"github.com/sirupsen/logrus"

"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber/config"
"github.com/batchcorp/plumber/server/types"

"github.com/streamdal/plumber/config"
"github.com/streamdal/plumber/server/types"
)

type Actions struct {
Expand Down
5 changes: 3 additions & 2 deletions actions/actionsfakes/fake_iactions.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion actions/connection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/batchcorp/plumber-schemas/build/go/protos/opts"

"github.com/batchcorp/plumber/server/types"
"github.com/streamdal/plumber/server/types"
)

func (a *Actions) UpdateConnection(_ context.Context, connectionID string, connOpts *opts.ConnectionOptions) (*types.Connection, error) {
Expand Down
9 changes: 5 additions & 4 deletions actions/relay.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ import (
"github.com/pkg/errors"

"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber/backends"
"github.com/batchcorp/plumber/prometheus"
"github.com/batchcorp/plumber/server/types"
"github.com/batchcorp/plumber/validate"

"github.com/streamdal/plumber/backends"
"github.com/streamdal/plumber/prometheus"
"github.com/streamdal/plumber/server/types"
"github.com/streamdal/plumber/validate"
)

func (a *Actions) CreateRelay(ctx context.Context, relayOpts *opts.RelayOptions) (*types.Relay, error) {
Expand Down
12 changes: 6 additions & 6 deletions actions/tunnel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (

"github.com/batchcorp/plumber-schemas/build/go/protos/opts"

"github.com/batchcorp/plumber/backends"
"github.com/batchcorp/plumber/options"
"github.com/batchcorp/plumber/prometheus"
"github.com/batchcorp/plumber/server/types"
"github.com/batchcorp/plumber/tunnel"
"github.com/batchcorp/plumber/validate"
"github.com/streamdal/plumber/backends"
"github.com/streamdal/plumber/options"
"github.com/streamdal/plumber/prometheus"
"github.com/streamdal/plumber/server/types"
"github.com/streamdal/plumber/tunnel"
"github.com/streamdal/plumber/validate"
)

func (a *Actions) CreateTunnel(reqCtx context.Context, tunnelOpts *opts.TunnelOptions) (*types.Tunnel, error) {
Expand Down
4 changes: 2 additions & 2 deletions backends/activemq/activemq.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/batchcorp/plumber/types"
"github.com/batchcorp/plumber/validate"
"github.com/streamdal/plumber/types"
"github.com/streamdal/plumber/validate"

"github.com/batchcorp/plumber-schemas/build/go/protos/args"
"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
Expand Down
5 changes: 3 additions & 2 deletions backends/activemq/display.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package activemq
import (
"time"

"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/pkg/errors"

"github.com/batchcorp/plumber/printer"
"github.com/batchcorp/plumber-schemas/build/go/protos/opts"

"github.com/streamdal/plumber/printer"

"github.com/batchcorp/plumber-schemas/build/go/protos/records"
)
Expand Down
2 changes: 1 addition & 1 deletion backends/activemq/read.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/pkg/errors"
uuid "github.com/satori/go.uuid"

"github.com/batchcorp/plumber/validate"
"github.com/streamdal/plumber/validate"

"github.com/batchcorp/plumber-schemas/build/go/protos/args"
"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
Expand Down
2 changes: 1 addition & 1 deletion backends/activemq/relay.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package activemq
import (
"context"

"github.com/batchcorp/plumber/types"
"github.com/streamdal/plumber/types"

"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber-schemas/build/go/protos/records"
Expand Down
5 changes: 3 additions & 2 deletions backends/activemq/tunnel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import (

"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber-schemas/build/go/protos/records"
"github.com/batchcorp/plumber/tunnel"
"github.com/batchcorp/plumber/validate"

"github.com/streamdal/plumber/tunnel"
"github.com/streamdal/plumber/validate"
)

func (a *ActiveMQ) Tunnel(ctx context.Context, tunnelOpts *opts.TunnelOptions, tunnelSvc tunnel.ITunnel, errorCh chan<- *records.ErrorRecord) error {
Expand Down
4 changes: 2 additions & 2 deletions backends/activemq/write.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/pkg/errors"

"github.com/batchcorp/plumber/util"
"github.com/batchcorp/plumber/validate"
"github.com/streamdal/plumber/util"
"github.com/streamdal/plumber/validate"

"github.com/batchcorp/plumber-schemas/build/go/protos/args"
"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
Expand Down
6 changes: 3 additions & 3 deletions backends/awskinesis/awskinesis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/batchcorp/plumber/types"
"github.com/batchcorp/plumber/validate"
"github.com/streamdal/plumber/types"
"github.com/streamdal/plumber/validate"

"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
)
Expand Down Expand Up @@ -50,7 +50,7 @@ func New(connOpts *opts.ConnectionOptions) (*Kinesis, error) {
})
} else {
// Use creds stored in ~/.aws/credentials
// https://github.com/batchcorp/plumber/issues/218
// https://github.com/streamdal/plumber/issues/218
sess = session.Must(session.NewSessionWithOptions(session.Options{
SharedConfigState: session.SharedConfigEnable,
}))
Expand Down
4 changes: 2 additions & 2 deletions backends/awskinesis/awskinesis_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"github.com/batchcorp/plumber/types"
"github.com/batchcorp/plumber/validate"
"github.com/streamdal/plumber/types"
"github.com/streamdal/plumber/validate"

"github.com/batchcorp/plumber-schemas/build/go/protos/args"
"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
Expand Down
3 changes: 2 additions & 1 deletion backends/awskinesis/display.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import (

"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber-schemas/build/go/protos/records"
"github.com/batchcorp/plumber/printer"

"github.com/streamdal/plumber/printer"
)

// DisplayMessage will parse a Read record and print (pretty) output to STDOUT
Expand Down
4 changes: 2 additions & 2 deletions backends/awskinesis/read.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/pkg/errors"
uuid "github.com/satori/go.uuid"

"github.com/batchcorp/plumber/util"
"github.com/batchcorp/plumber/validate"
"github.com/streamdal/plumber/util"
"github.com/streamdal/plumber/validate"

"github.com/batchcorp/plumber-schemas/build/go/protos/args"
"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
Expand Down
4 changes: 2 additions & 2 deletions backends/awskinesis/read_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber-schemas/build/go/protos/records"

"github.com/batchcorp/plumber/backends/awskinesis/kinesisfakes"
"github.com/batchcorp/plumber/validate"
"github.com/streamdal/plumber/backends/awskinesis/kinesisfakes"
"github.com/streamdal/plumber/validate"
)

var _ = Describe("AWS Kinesis Backend", func() {
Expand Down
3 changes: 2 additions & 1 deletion backends/awskinesis/relay.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import (

"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber-schemas/build/go/protos/records"
"github.com/batchcorp/plumber/types"

"github.com/streamdal/plumber/types"
)

func (k *Kinesis) Relay(ctx context.Context, relayOpts *opts.RelayOptions, relayCh chan interface{}, errorCh chan<- *records.ErrorRecord) error {
Expand Down
2 changes: 1 addition & 1 deletion backends/awskinesis/relay_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"github.com/batchcorp/plumber/types"
"github.com/streamdal/plumber/types"
)

var _ = Describe("AWS Kinesis Backend", func() {
Expand Down
5 changes: 3 additions & 2 deletions backends/awskinesis/tunnel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ import (
"github.com/aws/aws-sdk-go/service/kinesis"
"github.com/pkg/errors"

"github.com/batchcorp/plumber/validate"
"github.com/streamdal/plumber/validate"

"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber-schemas/build/go/protos/records"
"github.com/batchcorp/plumber/tunnel"

"github.com/streamdal/plumber/tunnel"
)

func (k *Kinesis) Tunnel(ctx context.Context, tunnelOpts *opts.TunnelOptions, tunnelSvc tunnel.ITunnel, errorCh chan<- *records.ErrorRecord) error {
Expand Down
7 changes: 4 additions & 3 deletions backends/awskinesis/tunnel_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ import (
"github.com/sirupsen/logrus"

"github.com/batchcorp/collector-schemas/build/go/protos/events"

"github.com/batchcorp/plumber-schemas/build/go/protos/args"
"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber-schemas/build/go/protos/records"

"github.com/batchcorp/plumber/backends/awskinesis/kinesisfakes"
"github.com/batchcorp/plumber/tunnel/tunnelfakes"
"github.com/batchcorp/plumber/validate"
"github.com/streamdal/plumber/backends/awskinesis/kinesisfakes"
"github.com/streamdal/plumber/tunnel/tunnelfakes"
"github.com/streamdal/plumber/validate"
)

var _ = Describe("AWS Kinesis Backend", func() {
Expand Down
4 changes: 2 additions & 2 deletions backends/awskinesis/write.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/aws/aws-sdk-go/service/kinesis"
"github.com/pkg/errors"

"github.com/batchcorp/plumber/util"
"github.com/batchcorp/plumber/validate"
"github.com/streamdal/plumber/util"
"github.com/streamdal/plumber/validate"

"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber-schemas/build/go/protos/records"
Expand Down
4 changes: 2 additions & 2 deletions backends/awskinesis/write_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber-schemas/build/go/protos/records"

"github.com/batchcorp/plumber/backends/awskinesis/kinesisfakes"
"github.com/batchcorp/plumber/validate"
"github.com/streamdal/plumber/backends/awskinesis/kinesisfakes"
"github.com/streamdal/plumber/validate"
)

var _ = Describe("AWS Kinesis Backend", func() {
Expand Down
6 changes: 3 additions & 3 deletions backends/awssns/awssns.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

plumberTypes "github.com/batchcorp/plumber/types"
"github.com/batchcorp/plumber/validate"
plumberTypes "github.com/streamdal/plumber/types"
"github.com/streamdal/plumber/validate"

"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
)
Expand Down Expand Up @@ -52,7 +52,7 @@ func New(connOpts *opts.ConnectionOptions) (*AWSSNS, error) {
})
} else {
// Use creds stored in ~/.aws/credentials
// https://github.com/batchcorp/plumber/issues/218
// https://github.com/streamdal/plumber/issues/218
sess = session.Must(session.NewSessionWithOptions(session.Options{
SharedConfigState: session.SharedConfigEnable,
}))
Expand Down
8 changes: 5 additions & 3 deletions backends/awssns/awssns_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ package awssns
import (
"context"

"github.com/batchcorp/plumber-schemas/build/go/protos/args"
"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber/validate"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"github.com/batchcorp/plumber-schemas/build/go/protos/args"
"github.com/batchcorp/plumber-schemas/build/go/protos/opts"

"github.com/streamdal/plumber/validate"
)

var _ = Describe("AWSSNS Backend", func() {
Expand Down
3 changes: 2 additions & 1 deletion backends/awssns/display.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ package awssns
import (
"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber-schemas/build/go/protos/records"
"github.com/batchcorp/plumber/printer"

"github.com/streamdal/plumber/printer"
)

// DisplayMessage returns nothing because SNS is a publish only backend
Expand Down
2 changes: 1 addition & 1 deletion backends/awssns/read.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package awssns
import (
"context"

"github.com/batchcorp/plumber/types"
"github.com/streamdal/plumber/types"

"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber-schemas/build/go/protos/records"
Expand Down
2 changes: 1 addition & 1 deletion backends/awssns/relay.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package awssns
import (
"context"

"github.com/batchcorp/plumber/types"
"github.com/streamdal/plumber/types"

"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber-schemas/build/go/protos/records"
Expand Down
4 changes: 2 additions & 2 deletions backends/awssns/tunnel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/aws/aws-sdk-go/service/sns"
"github.com/pkg/errors"

"github.com/batchcorp/plumber/tunnel"
"github.com/batchcorp/plumber/validate"
"github.com/streamdal/plumber/tunnel"
"github.com/streamdal/plumber/validate"

"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber-schemas/build/go/protos/records"
Expand Down
14 changes: 8 additions & 6 deletions backends/awssns/tunnel_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@ import (

"github.com/aws/aws-sdk-go/service/sns"
"github.com/batchcorp/collector-schemas/build/go/protos/events"
"github.com/batchcorp/plumber-schemas/build/go/protos/args"
"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber-schemas/build/go/protos/records"
"github.com/batchcorp/plumber/backends/awssns/snsfakes"
"github.com/batchcorp/plumber/tunnel/tunnelfakes"
"github.com/batchcorp/plumber/validate"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/sirupsen/logrus"

"github.com/batchcorp/plumber-schemas/build/go/protos/args"
"github.com/batchcorp/plumber-schemas/build/go/protos/opts"
"github.com/batchcorp/plumber-schemas/build/go/protos/records"

"github.com/streamdal/plumber/backends/awssns/snsfakes"
"github.com/streamdal/plumber/tunnel/tunnelfakes"
"github.com/streamdal/plumber/validate"
)

var _ = Describe("", func() {
Expand Down
Loading

0 comments on commit 04acb41

Please sign in to comment.