From 3b8125a24d57f04468268196b0e3402318a2ca0a Mon Sep 17 00:00:00 2001
From: Paul Banks <banks@banksco.de>
Date: Thu, 1 Oct 2020 16:19:10 +0100
Subject: [PATCH] Update all the references in CI and makefile to the bindata
 file location

---
 .circleci/config.yml                  | 10 +++++-----
 GNUmakefile                           |  2 +-
 agent/uiserver/buffered_file.go       |  2 +-
 build-support/functions/30-release.sh |  2 +-
 build-support/functions/40-publish.sh |  2 +-
 codecov.yml                           |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ad43dd92d0..ab618b7583 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -626,7 +626,7 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-            - ./agent/bindata_assetfs.go
+            - ./agent/uiserver/bindata_assetfs.go
       - run: *notify-slack-failure
 
   # commits static assets to git
@@ -641,16 +641,16 @@ jobs:
       - attach_workspace:
           at: .
       - run:
-          name: commit agent/bindata_assetfs.go if there are changes
+          name: commit agent/uiserver/bindata_assetfs.go if there are changes
           command: |
             exit 0
-            if ! git diff --exit-code agent/bindata_assetfs.go; then
+            if ! git diff --exit-code agent/uiserver/bindata_assetfs.go; then
               git config --local user.email "hashicorp-ci@users.noreply.github.com"
               git config --local user.name "hashicorp-ci"
 
               short_sha=$(git rev-parse --short HEAD)
-              git add agent/bindata_assetfs.go
-              git commit -m "auto-updated agent/bindata_assetfs.go from commit ${short_sha}"
+              git add agent/uiserver/bindata_assetfs.go
+              git commit -m "auto-updated agent/uiserver/bindata_assetfs.go from commit ${short_sha}"
               git push origin master
             else
               echo "no new static assets to publish"
diff --git a/GNUmakefile b/GNUmakefile
index 87758e688f..9fdfab8ec8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -16,7 +16,7 @@ GOARCH?=$(shell go env GOARCH)
 GOPATH=$(shell go env GOPATH)
 MAIN_GOPATH=$(shell go env GOPATH | cut -d: -f1)
 
-ASSETFS_PATH?=agent/bindata_assetfs.go
+ASSETFS_PATH?=agent/uiserver/bindata_assetfs.go
 # Get the git commit
 GIT_COMMIT?=$(shell git rev-parse --short HEAD)
 GIT_COMMIT_YEAR?=$(shell git show -s --format=%cd --date=format:%Y HEAD)
diff --git a/agent/uiserver/buffered_file.go b/agent/uiserver/buffered_file.go
index 040ae3aae1..13aa84e030 100644
--- a/agent/uiserver/buffered_file.go
+++ b/agent/uiserver/buffered_file.go
@@ -7,7 +7,7 @@ import (
 	"time"
 )
 
-// bufferedFile implements os.File and allows us to modify a file from disk by
+// bufferedFile implements http.File and allows us to modify a file from disk by
 // writing out the new version into a buffer and then serving file reads from
 // that.
 type bufferedFile struct {
diff --git a/build-support/functions/30-release.sh b/build-support/functions/30-release.sh
index c55e8f1fec..37135f48e8 100644
--- a/build-support/functions/30-release.sh
+++ b/build-support/functions/30-release.sh
@@ -477,7 +477,7 @@ function build_release {
       
       if is_set "${do_tag}"
       then
-         git add "${sdir}/agent/bindata_assetfs.go"
+         git add "${sdir}/agent/uiserver/bindata_assetfs.go"
          if test $? -ne 0
          then
             err "ERROR: Failed to git add the assetfs file" 
diff --git a/build-support/functions/40-publish.sh b/build-support/functions/40-publish.sh
index 8e511e32f5..c1ed2be0a2 100644
--- a/build-support/functions/40-publish.sh
+++ b/build-support/functions/40-publish.sh
@@ -99,7 +99,7 @@ function confirm_git_push_changes {
                ;;
             ?)
                # bindata_assetfs.go will make these meaningless
-               git_diff "$(pwd)" ":!agent/bindata_assetfs.go"|| ret 1
+               git_diff "$(pwd)" ":!agent/uiserver/bindata_assetfs.go"|| ret 1
                answer=""
                ;;
             * )
diff --git a/codecov.yml b/codecov.yml
index 33606c5bab..9e6e403021 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -39,6 +39,6 @@ github_checks:
   annotations: false
 
 ignore:
-  - "agent/bindata_assetfs.go"
+  - "agent/uiserver/bindata_assetfs.go"
   - "vendor/**/*"
   - "**/*.pb.go"