Skip to content

Commit

Permalink
fix: merge in upstream changes
Browse files Browse the repository at this point in the history
Commits added: openflagr/flagr@29bc19a...ad810f8

Kewei Zhang (1):
      bump docker action version (openflagr#520)

Zhuojie Zhou | rex (4):
      Add edited cd_docker event (openflagr#521)
      Revert "Add edited cd_docker event (openflagr#521)" (openflagr#522)
      Use github native release note generator (openflagr#523)
      Big bump on all the go deps (openflagr#524)
  • Loading branch information
Jesper Terkelsen committed Jan 25, 2023
1 parent db6dc6c commit 3304348
Show file tree
Hide file tree
Showing 27 changed files with 530 additions and 1,308 deletions.
727 changes: 1 addition & 726 deletions CHANGELOG.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ start:
gen: api_docs swagger

deps:
@go install github.com/go-swagger/go-swagger/cmd/swagger@v0.29.0
@go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.49.0
@go install github.com/go-swagger/go-swagger/cmd/swagger@v0.30.4
@go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.1

serve_docs:
@npm install -g docsify-cli@4
Expand Down
2 changes: 1 addition & 1 deletion browser/flagr-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flagr-ui",
"version": "1.1.14",
"version": "1.1.15",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
2 changes: 1 addition & 1 deletion docs/api_docs/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ info:
Flagr is a feature flagging, A/B testing and dynamic configuration
microservice. The base path for all the APIs is "/api/v1".
title: Flagr
version: 1.1.14
version: 1.1.15
tags:
- name: flag
description: Everything about the flag
Expand Down
196 changes: 106 additions & 90 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,122 +3,138 @@ module github.com/openflagr/flagr
go 1.19

require (
cloud.google.com/go v0.37.4
github.com/DataDog/datadog-go v0.0.0-20180330214955-e67964b4021a
github.com/Shopify/sarama v1.29.1
github.com/a8m/kinesis-producer v0.0.0-20180723062609-03228a9f79b3
cloud.google.com/go v0.108.0 // indirect
github.com/DataDog/datadog-go v4.8.3+incompatible
github.com/Shopify/sarama v1.38.0
github.com/a8m/kinesis-producer v0.2.0
github.com/auth0/go-jwt-middleware v1.0.2-0.20210804140707-b4090e955b98
github.com/avast/retry-go v3.0.0+incompatible
github.com/aws/aws-sdk-go v1.34.28
github.com/aws/aws-sdk-go v1.44.180
github.com/brandur/simplebox v0.0.0-20150921201729-84e9865bb03a
github.com/bsm/ratelimit v2.0.0+incompatible
github.com/caarlos0/env v3.3.0+incompatible
github.com/certifi/gocertifi v0.0.0-20180118203423-deb3ae2ef261 // indirect
github.com/caarlos0/env v3.5.0+incompatible
github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect
github.com/davecgh/go-spew v1.1.1
github.com/dchest/uniuri v0.0.0-20160212164326-8902c56451e9
github.com/evalphobia/logrus_sentry v0.4.6
github.com/form3tech-oss/jwt-go v3.2.3+incompatible
github.com/getsentry/raven-go v0.0.0-20180903072508-084a9de9eb03
github.com/go-openapi/analysis v0.21.2 // indirect
github.com/go-openapi/errors v0.20.2
github.com/go-openapi/jsonreference v0.19.6 // indirect
github.com/go-openapi/loads v0.21.1
github.com/go-openapi/runtime v0.23.0
github.com/go-openapi/spec v0.20.4
github.com/go-openapi/strfmt v0.21.2
github.com/go-openapi/swag v0.21.1
github.com/go-openapi/validate v0.20.3
github.com/dchest/uniuri v1.2.0
github.com/evalphobia/logrus_sentry v0.8.2
github.com/form3tech-oss/jwt-go v3.2.5+incompatible
github.com/getsentry/raven-go v0.2.0
github.com/go-openapi/analysis v0.21.4 // indirect
github.com/go-openapi/errors v0.20.3
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/loads v0.21.2
github.com/go-openapi/runtime v0.25.0
github.com/go-openapi/spec v0.20.8
github.com/go-openapi/strfmt v0.21.3
github.com/go-openapi/swag v0.22.3
github.com/go-openapi/validate v0.22.1
github.com/gohttp/pprof v0.0.0-20141119085724-c9d246cbb3ba
github.com/jessevdk/go-flags v1.4.0
github.com/jpillora/backoff v0.0.0-20170918002102-8eab2debe79d // indirect
github.com/mattn/go-sqlite3 v1.14.9 // indirect
github.com/meatballhat/negroni-logrus v0.0.0-20170801195057-31067281800f
github.com/newrelic/go-agent v2.1.0+incompatible
github.com/onsi/ginkgo v1.8.0 // indirect
github.com/onsi/gomega v1.5.0 // indirect
github.com/philhofer/fwd v1.0.0 // indirect
github.com/phyber/negroni-gzip v0.0.0-20180113114010-ef6356a5d029
github.com/prashantv/gostub v0.0.0-20170112001514-5c68b99bb088
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
github.com/prometheus/procfs v0.0.0-20190219184716-e4d4a2206da0 // indirect
github.com/rs/cors v1.8.2
github.com/sirupsen/logrus v1.6.0
github.com/spf13/cast v1.3.0
github.com/stretchr/testify v1.7.0
github.com/tinylib/msgp v1.1.0 // indirect
github.com/jessevdk/go-flags v1.5.0
github.com/jpillora/backoff v1.0.0 // indirect
github.com/mattn/go-sqlite3 v1.14.16 // indirect
github.com/meatballhat/negroni-logrus v1.1.1
github.com/philhofer/fwd v1.1.2 // indirect
github.com/phyber/negroni-gzip v1.0.0
github.com/prashantv/gostub v1.1.0
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/rs/cors v1.8.3
github.com/sirupsen/logrus v1.9.0
github.com/spf13/cast v1.5.0
github.com/stretchr/testify v1.8.1
github.com/tinylib/msgp v1.1.8 // indirect
github.com/urfave/negroni v1.0.0
github.com/yadvendar/negroni-newrelic-go-agent v0.0.0-20160803090806-3dc58758cb67
github.com/zhouzhuojie/conditions v0.2.3
github.com/zhouzhuojie/withtimeout v0.0.0-20190405051827-12b39eb2edd5
golang.org/x/net v0.0.0-20210614182718-04defd469f4e
google.golang.org/api v0.3.1
google.golang.org/grpc v1.19.0
gopkg.in/DataDog/dd-trace-go.v1 v1.9.0
golang.org/x/net v0.5.0
google.golang.org/api v0.107.0
google.golang.org/grpc v1.52.0
gopkg.in/DataDog/dd-trace-go.v1 v1.46.0
)

require (
gorm.io/driver/mysql v1.2.1
gorm.io/driver/postgres v1.2.3
gorm.io/driver/sqlite v1.2.6
gorm.io/gorm v1.22.4
cloud.google.com/go/pubsub v1.28.0
github.com/newrelic/go-agent v2.1.0+incompatible
gorm.io/driver/mysql v1.4.5
gorm.io/driver/postgres v1.4.6
gorm.io/driver/sqlite v1.4.4
gorm.io/gorm v1.24.3
)

require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/eapache/go-resiliency v1.2.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
cloud.google.com/go/compute v1.15.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.10.0 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.41.1 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.42.0-rc.5 // indirect
github.com/DataDog/datadog-go/v5 v5.2.0 // indirect
github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork // indirect
github.com/DataDog/sketches-go v1.4.1 // indirect
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/eapache/go-resiliency v1.3.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 // indirect
github.com/eapache/queue v1.1.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-sql-driver/mysql v1.6.0 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/golang/protobuf v1.2.0 // indirect
github.com/golang/snappy v0.0.3 // indirect
github.com/google/go-cmp v0.5.4 // indirect
github.com/googleapis/gax-go/v2 v2.0.4 // indirect
github.com/hashicorp/go-uuid v1.0.2 // indirect
github.com/hashicorp/golang-lru v0.5.0 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgconn v1.10.1 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-sql-driver/mysql v1.7.0 // indirect
github.com/golang/glog v1.0.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.1 // indirect
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.2.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
github.com/jackc/pgtype v1.9.0 // indirect
github.com/jackc/pgx/v4 v4.14.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgx/v5 v5.2.0 // indirect
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
github.com/jcmturner/gofork v1.0.0 // indirect
github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect
github.com/jcmturner/gofork v1.7.6 // indirect
github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.3 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/klauspost/compress v1.15.14 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/pierrec/lz4 v2.6.0+incompatible // indirect
github.com/pierrec/lz4/v4 v4.1.17 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/common v0.2.0 // indirect
github.com/prometheus/common v0.39.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
go.mongodb.org/mongo-driver v1.9.1 // indirect
go.opencensus.io v0.20.1 // indirect
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 // indirect
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/appengine v1.4.0 // indirect
google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
go.mongodb.org/mongo-driver v1.11.1 // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go4.org/intern v0.0.0-20220617035311-6925f38cc365 // indirect
go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/oauth2 v0.4.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.5.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
inet.af/netaddr v0.0.0-20220811202034-502d2d690317 // indirect
)
Loading

0 comments on commit 3304348

Please sign in to comment.