Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit dd3d10c

Browse files
author
jmusselwhite
committed
Fixing linting errors
1 parent f8fcadd commit dd3d10c

File tree

6 files changed

+29
-8
lines changed

6 files changed

+29
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ The script requires the following environment variables to be defined:
121121
* USER_PASSWORD - the password to login to the Postgres instance
122122
* PG_ADMIN_CONSOLE_PASSWORD - the password to login to the pgAdmin UI
123123

124-
Here is what it looks like to run **create.sh**:
124+
Here is what it looks like to run **create.sh**:
125125

126126
```USER_PASSWORD=password PG_ADMIN_CONSOLE_PASSWORD=password ./create.sh INSTANCE_NAME POSTGRES_USERNAME PGADMIN_USERNAME```
127127

scripts/cluster.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
set -o errexit
2121

2222
ROOT=$(dirname "${BASH_SOURCE[0]}")
23+
# shellcheck disable=SC1090
2324
source "${ROOT}"/constants.sh
2425

2526

scripts/constants.sh

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,28 @@
1-
PROJECT=$(gcloud config get-value core/project)
1+
#!/bin/bash -e
2+
3+
# Copyright 2018 Google LLC
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# https://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
216

17+
PROJECT=$(gcloud config get-value core/project)
18+
export PROJECT
319
CLUSTER_ZONE=$(gcloud config get-value compute/zone)
4-
CLUSTER_NAME=postgres-demo-cluster
20+
export CLUSTER_ZONE
21+
export CLUSTER_NAME=postgres-demo-cluster
522

623
INSTANCE_REGION=$(gcloud config get-value compute/region)
7-
8-
SA_NAME=postgres-demo-sa
9-
NODE_SA_NAME=postgres-demo-node-sa
10-
FULL_SA_NAME=$SA_NAME@$PROJECT.iam.gserviceaccount.com
11-
FULL_NODE_SA_NAME=$NODE_SA_NAME@$PROJECT.iam.gserviceaccount.com
24+
export INSTANCE_REGION
25+
export SA_NAME=postgres-demo-sa
26+
export NODE_SA_NAME=postgres-demo-node-sa
27+
export FULL_SA_NAME=$SA_NAME@$PROJECT.iam.gserviceaccount.com
28+
export FULL_NODE_SA_NAME=$NODE_SA_NAME@$PROJECT.iam.gserviceaccount.com

scripts/delete_resources.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
# that includes a prompt in another script
2020

2121
ROOT=$(dirname "${BASH_SOURCE[0]}")
22+
# shellcheck disable=SC1090
2223
source "${ROOT}"/constants.sh
2324

2425
gcloud container clusters delete \

scripts/service_account.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
# for logging and monitoring as recommended by the GKE documentation
2222

2323
ROOT=$(dirname "${BASH_SOURCE[0]}")
24+
# shellcheck disable=SC1090
2425
source "${ROOT}"/constants.sh
2526

2627
if [ -z "$PROJECT" ]; then

validate.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
# make sure the Cloud SQL instance is up, as well as the GKE cluster and pod
1919

2020
ROOT=$(dirname "${BASH_SOURCE[0]}")
21+
# shellcheck disable=SC1090
2122
source "${ROOT}"/scripts/constants.sh
2223

2324
help() {

0 commit comments

Comments
 (0)