Merge pull request #6026 from influxdata/smith/security

chore: Update to go1.20
influxdata · Feb 28, 2023 · a9dcfcf · a9dcfcf
2 parents 6261caa + 640feda
commit a9dcfcf
Show file tree

Hide file tree

Showing 9 changed files with 108 additions and 101 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -37,7 +37,7 @@ workflows:
 jobs:
   build:
     environment:
-      DOCKER_TAG: chronograf-20220721
+      DOCKER_TAG: chronograf-20230228
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -61,7 +61,7 @@ jobs:
 
   deploy-nightly:
     environment:
-      DOCKER_TAG: chronograf-20220721
+      DOCKER_TAG: chronograf-20230228
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -90,7 +90,7 @@ jobs:
 
   deploy-pre-release:
     environment:
-      DOCKER_TAG: chronograf-20220721
+      DOCKER_TAG: chronograf-20230228
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -121,7 +121,7 @@ jobs:
 
   deploy-release:
     environment:
-      DOCKER_TAG: chronograf-20220721
+      DOCKER_TAG: chronograf-20230228
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02

diff --git a/.github/workflows/chronograf-cypress-tests.yaml b/.github/workflows/chronograf-cypress-tests.yaml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.18.4'
+          go-version: '1.20.1'
 
       - uses: actions/setup-node@v2
         with:
@@ -121,4 +121,3 @@ jobs:
               ui/cypress/videos/*.mp4
               ui/cypress/screenshots/
               ui/cypress/results/results-*.xml
-
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.17
 
 ENV PROTOBOARDS_PATH /usr/share/chronograf/protoboards
 ENV CANNED_PATH /usr/share/chronograf/canned

diff --git a/chronograf.go b/chronograf.go
@@ -821,13 +821,15 @@ const MappingWildcard string = "*"
 // explicit role within the organization.
 //
 // One can think of a mapping like so:
-//     Provider:Scheme:Group -> Organization
-//     github:oauth2:influxdata -> Happy
-//     beyondcorp:ldap:influxdata -> TheBillHilliettas
+//
+//	Provider:Scheme:Group -> Organization
+//	github:oauth2:influxdata -> Happy
+//	beyondcorp:ldap:influxdata -> TheBillHilliettas
 //
 // Any of Provider, Scheme, or Group may be provided as a wildcard *
-//     github:oauth2:* -> MyOrg
-//     *:*:* -> AllOrg
+//
+//	github:oauth2:* -> MyOrg
+//	*:*:* -> AllOrg
 type Mapping struct {
 	ID                   string `json:"id"`
 	Organization         string `json:"organizationId"`

diff --git a/etc/Dockerfile_build b/etc/Dockerfile_build
@@ -22,9 +22,9 @@ RUN gem install fpm
 # Install node
 ENV NODE_VERSION v16.14.2
 RUN wget -q https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.gz; \
-   mkdir /usr/local/node; \
-   tar -xvf node-${NODE_VERSION}-linux-x64.tar.gz -C /usr/local/node --strip-components=1; \
-   rm -f node-${NODE_VERSION}-linux-x64.tar.gz
+    mkdir /usr/local/node; \
+    tar -xvf node-${NODE_VERSION}-linux-x64.tar.gz -C /usr/local/node --strip-components=1; \
+    rm -f node-${NODE_VERSION}-linux-x64.tar.gz
 ENV PATH=/usr/local/node/bin:$PATH
 
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
@@ -33,12 +33,12 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
 
 # Install go
 ENV GOPATH /root/go
-ENV GO_VERSION 1.18.4
+ENV GO_VERSION 1.20.1
 ENV GO_ARCH amd64
 ENV GO111MODULES ON
 RUN wget https://golang.org/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \
-   tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ; \
-   rm /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz
+    tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ; \
+    rm /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz
 ENV PATH /usr/local/go/bin:$PATH
 
 ENV PROJECT_DIR $GOPATH/src/github.com/influxdata/chronograf

diff --git a/etc/build.py b/etc/build.py
@@ -297,6 +297,10 @@ def get_current_commit(short=False):
     out = run(command)
     return out.strip('\'\n\r ')
 
+def set_safe_directory():
+    out = run("git config --global --add safe.directory *")
+    return out.strip()
+
 def get_current_branch():
     """Retrieve the current git branch.
     """
@@ -948,6 +952,7 @@ def main(args):
                         level=LOG_LEVEL,
                         format=log_format)
 
+    logging.info(set_safe_directory())
     parser = argparse.ArgumentParser(description='InfluxDB build and packaging script.')
     parser.add_argument('--verbose','-v','--debug',
                         action='store_true',

diff --git a/filestore/filestore.go b/filestore/filestore.go
@@ -8,12 +8,13 @@
 //
 // Resources that are storable in a file are:
 // (CRUD refers to create, read, update, delete. An '_' means not supported)
-//    Apps(layouts) - _R__
-//    Dashboards    - _RUD
-//    Kapacitors    - _RUD
-//    Organizations - _R__
-//    Protoboards   - _R__
-//    Sources       - _RUD
+//
+//	Apps(layouts) - _R__
+//	Dashboards    - _RUD
+//	Kapacitors    - _RUD
+//	Organizations - _R__
+//	Protoboards   - _R__
+//	Sources       - _RUD
 //
 // Caution should be taken when editing resources provided via the filestore,
 // especially in a distributed environment as unexpected behavior may occur.

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/influxdata/chronograf
 
-go 1.18
+go 1.20
 
 require (
 	cloud.google.com/go/bigtable v1.10.0 // indirect