Merge branch 'master' into fix/variable-hydration-issue

.goreleaser-nightly.yml

@@ -15,8 +15,8 @@ builds:
       - GO111MODULE=on
       - CGO_ENABLED=1
       - CC=xcc
-      - PKG_CONFIG=/go/bin/pkg-config
-    ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.ShortCommit}} -X main.date={{.Date}}
+      - PKG_CONFIG=$GOPATH/bin/pkg-config
+    ldflags: -s -w -X main.version=nightly -X main.commit={{.ShortCommit}} -X main.date={{.Date}}
     binary: influx
   - id: influxd
     goos:
@@ -35,8 +35,8 @@ builds:
       - GO111MODULE=on
       - CGO_ENABLED=1
       - CC=xcc
-      - PKG_CONFIG=/go/bin/pkg-config
-    ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.ShortCommit}} -X main.date={{.Date}}
+      - PKG_CONFIG=$GOPATH/bin/pkg-config
+    ldflags: -s -w -X main.version=nightly -X main.commit={{.ShortCommit}} -X main.date={{.Date}}
     binary: influxd
     hooks:
       pre: make generate
@@ -47,14 +47,11 @@ archives:
     format_overrides:
       - goos: windows
         format: zip
-    name_template: "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
+    name_template: "{{ .Binary }}_nightly_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
     files:
       - LICENSE
       - README.md
 
-snapshot:
-  name_template: "nightly"
-
 blobs:
   - provider: "s3"
     bucket: "dl.influxdata.com"
@@ -68,7 +65,7 @@ dockers:
       - influxd
       - influx
     image_templates:
-      - "quay.io/influxdb/influx:{{ .Version }}"
+      - "quay.io/influxdb/influx:nightly"
     dockerfile: docker/influxd/Dockerfile
     extra_files:
       - docker/influxd/entrypoint.sh

.goreleaser.yml

@@ -2,52 +2,64 @@ project_name: influxdb
 builds:
   - id: influx
     goos:
-    - linux
+      - linux
     # Darwin cross compilation involves installing
     # a compiler toolchain for it.
     # https://github.com/influxdata/flux/issues/2654
     # - darwin
     goarch:
-    - amd64
-    - arm64
+      - amd64
+      - arm64
     main: ./cmd/influx/
     env:
       - GO111MODULE=on
       - CGO_ENABLED=1
       - CC=xcc
-      - PKG_CONFIG=/go/bin/pkg-config
+      - PKG_CONFIG=$GOPATH/bin/pkg-config
     ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.ShortCommit}} -X main.date={{.Date}}
     binary: influx
   - id: influxd
     goos:
-    - linux
+      - linux
     # Darwin cross compilation involves installing
     # a compiler toolchain for it.
     # https://github.com/influxdata/flux/issues/2654
     # - darwin
     goarch:
-    - amd64
-    - arm64
+      - amd64
+      - arm64
     main: ./cmd/influxd/
     flags:
       - -tags=assets
     env:
       - GO111MODULE=on
       - CGO_ENABLED=1
       - CC=xcc
-      - PKG_CONFIG=/go/bin/pkg-config
+      - PKG_CONFIG=$GOPATH/bin/pkg-config
     ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.ShortCommit}} -X main.date={{.Date}}
     binary: influxd
     hooks:
       pre: make generate
 
 archives:
-  - format: tar.gz
+  - id: influxdb_client
+    builds: ["influx"]
+    format: tar.gz
     wrap_in_directory: true
     format_overrides:
       - goos: windows
         format: zip
-    name_template: 'influxdb_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
+    name_template: 'influxdb_client_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
+    files:
+      - LICENSE
+      - README.md
+  - id: influxdb_single_binary
+    format: tar.gz
+    wrap_in_directory: true
+    format_overrides:
+      - goos: windows
+        format: zip
+    name_template: "influxdb_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
     files:
       - LICENSE
       - README.md
@@ -62,10 +74,10 @@ dockers:
   - goos: linux
     goarch: amd64
     binaries:
-    - influxd
-    - influx
+      - influxd
+      - influx
     image_templates:
-      - 'quay.io/influxdb/influxdb:{{ .Env.DOCKER_VERSION }}'
+      - "quay.io/influxdb/influxdb:{{ .Env.DOCKER_VERSION }}"
     dockerfile: docker/influxd/Dockerfile
     extra_files:
       - docker/influxd/entrypoint.sh
@@ -74,5 +86,5 @@ dockers:
 release:
   name_template: "v{{.Version}}"
   prerelease: auto # when we go to GA remove this line
-  draft: true      # when we go to GA remove this line
-  disable: true    # we keep the artifacts in S3 and link from the website
+  draft: true # when we go to GA remove this line
+  disable: true # we keep the artifacts in S3 and link from the website

CHANGELOG.md

@@ -6,13 +6,20 @@
 1. [18322](https://github.com/influxdata/influxdb/pull/18322): Add ability to export a stack's existing (as they are in the platform) resource state as a pkg
 1. [18334](https://github.com/influxdata/influxdb/pull/18334): Update influx pkg commands with improved usage and examples in long form.
 1. [18344](https://github.com/influxdata/influxdb/pull/18344): Extend influx CLI with version and User-Agent.
+1. [18355](https://github.com/influxdata/influxdb/pull/18355): Integrate RedirectTo functionality so CLOUD users now get navigated back to the originally linked page after login
 
 ### Bug Fixes
 
 1. [18331](https://github.com/influxdata/influxdb/pull/18331): Support organization name in addition to ID in DBRP operations
 1. [18335](https://github.com/influxdata/influxdb/pull/18335): Disable failing when providing an unexpected error to influx CLI
 1. [18345](https://github.com/influxdata/influxdb/pull/18345): Have influx delete cmd respect the config
 1. [18346](https://github.com/influxdata/influxdb/pull/18346): Reduce the number of variables being hydrated when toggling variables
+1. [18385](https://github.com/influxdata/influxdb/pull/18385): Store initialization for pkger enforced on reads
+
+### UI Improvements
+
+1. [18319](https://github.com/influxdata/influxdb/pull/18319): Display bucket ID in bucket list and enable 1 click copying
+1. [18361](https://github.com/influxdata/influxdb/pull/18361): Tokens list is now consistent with the other resource lists
 
 ## v2.0.0-beta.11 [2020-05-26]
 

Makefile

@@ -162,15 +162,17 @@ build: all
 goreleaser:
 	curl -sfL -o goreleaser-install https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh
 	sh goreleaser-install v0.135.0
+	go build -o $(GOPATH)/bin/pkg-config github.com/influxdata/pkg-config
+	install xcc.sh $(GOPATH)/bin/xcc
 
 # Parallelism for goreleaser must be set to 1 so it doesn't
 # attempt to invoke pkg-config, which invokes cargo,
 # for multiple targets at the same time.
 dist: goreleaser
-	./bin/goreleaser -p 1 --rm-dist --config=.goreleaser-nightly.yml
+	./bin/goreleaser -p 1 --skip-validate --rm-dist --config=.goreleaser-nightly.yml
 
 nightly: goreleaser
-	./bin/goreleaser -p 1 --rm-dist --config=.goreleaser-nightly.yml
+	./bin/goreleaser -p 1 --skip-validate --rm-dist --config=.goreleaser-nightly.yml
 
 release: goreleaser
 	git checkout -- go.sum # avoid dirty git repository caused by go install