Merge branch 'main' into detect-project-flag-mismatch

hashicorp · Dec 16, 2021 · d5fa740 · d5fa740
2 parents 75cfa5f + 2f209de
commit d5fa740
Show file tree

Hide file tree

Showing 245 changed files with 18,734 additions and 11,173 deletions.
diff --git a/.changelog/2681.txt b/.changelog/2681.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: upgraded icons to flight icons library
+```
diff --git a/.changelog/2793.txt b/.changelog/2793.txt
@@ -0,0 +1,3 @@
+```release-note:feature
+ui: Added timeline component to artifact details pages
+```
diff --git a/.changelog/2795.txt b/.changelog/2795.txt
@@ -0,0 +1,4 @@
+```release-note:improvement
+cli: Report where each operation runs (locally vs remotely)
+```
+
diff --git a/.changelog/2797.txt b/.changelog/2797.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+cli: Add new `workspace create` command
+```
diff --git a/.changelog/2799.txt b/.changelog/2799.txt
@@ -0,0 +1,4 @@
+```release-note:improvement
+cli: Warn if about to perform a remote operation with a dirty local git state 
+```
+
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.6.3 (December 10, 2021)
+
+SECURITY UPDATE:
+* Update Go build version to 1.16.12 per [Go security release](https://groups.google.com/g/golang-announce/c/hcmEScgc00k?pli=1)
+
 ## 0.6.2 (November 4, 2021)
 
 FEATURES:

diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@
 # builder builds the Waypoint binaries
 #--------------------------------------------------------------------
 
-FROM docker.mirror.hashicorp.services/golang:1.16.5-alpine3.13 AS builder
+FROM docker.mirror.hashicorp.services/golang:1.17.5-alpine3.15 AS builder
 
 RUN apk add --no-cache git gcc libc-dev make
 
@@ -15,7 +15,7 @@ COPY go.mod /tmp/wp-prime
 WORKDIR /tmp/wp-prime
 
 RUN go mod download
-RUN go get github.com/kevinburke/go-bindata/...
+RUN go install github.com/kevinburke/go-bindata/go-bindata
 
 COPY . /tmp/wp-src
 WORKDIR /tmp/wp-src
@@ -53,7 +53,7 @@ ENTRYPOINT ["/kaniko/waypoint"]
 # final image
 #--------------------------------------------------------------------
 
-FROM docker.mirror.hashicorp.services/alpine:3.13.5
+FROM docker.mirror.hashicorp.services/alpine:3.15.0
 
 # git is for gitrefpretty() and other calls for Waypoint
 RUN apk add --no-cache git

diff --git a/builtin/aws/lambda/platform_logs.go b/builtin/aws/lambda/platform_logs.go
@@ -6,6 +6,8 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
 	"github.com/hashicorp/go-hclog"
@@ -48,7 +50,7 @@ func (p *Platform) Logs(
 		})
 
 		if err != nil {
-			return err
+			return errors.Wrapf(err, "failed to describe log stream for group %q in region %q", group, p.config.Region)
 		}
 
 		if len(streams.LogStreams) == 0 {

diff --git a/builtin/vault/freeport/ephemeral_fallback.go b/builtin/vault/freeport/ephemeral_fallback.go
@@ -1,4 +1,5 @@
-//+build !linux
+//go:build !linux
+// +build !linux
 
 package freeport
 

diff --git a/builtin/vault/freeport/ephemeral_linux.go b/builtin/vault/freeport/ephemeral_linux.go
@@ -1,4 +1,5 @@
-//+build linux
+//go:build linux
+// +build linux
 
 package freeport
 

diff --git a/builtin/vault/freeport/ephemeral_linux_test.go b/builtin/vault/freeport/ephemeral_linux_test.go
@@ -1,4 +1,5 @@
-//+build linux
+//go:build linux
+// +build linux
 
 package freeport
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "HashiCorp Waypoint project";
 
-  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/release-21.11";
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
   outputs = { self, nixpkgs, flake-utils }: