8000 Fix outdated code by aldian · Pull Request #1 · sidpalas/storybooks · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix outdated code #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-push-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
uses: actions/checkout@v2

# Setup gcloud CLI
- uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
- uses: google-github-actions/setup-gcloud@v0
with:
version: '290.0.1'
service_account_key: ${{ secrets.GCE_SA_KEY }}
Expand Down
1 change: 1 addition & 0 deletions config/passport.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ module.exports = function (passport) {
clientID: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
callbackURL: '/auth/google/callback',
proxy: true,
},
async (accessToken, refreshToken, profile, done) => {
const newUser = {
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
depends_on:
- mongo
mongo:
image: mongo:3.6-xenial
image: mongo:5.0.6-focal
environment:
- MONGO_INITDB_DATABASE=storybooks
ports:
Expand Down
5 changes: 2 additions & 3 deletions terraform/atlas.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
provider "mongodbatlas" {
public_key = var.mongodbatlas_public_key
private_key = var.mongodbatlas_private_key
version = "~> 0.6"
}

# cluster
Expand All @@ -13,7 +12,7 @@ resource "mongodbatlas_cluster" "mongo_cluster" {
replication_factor = 3
provider_backup_enabled = true
auto_scaling_disk_gb_enabled = true
mongo_db_major_version = "3.6"
mongo_db_major_version = "5.0"

//Provider Settings "block"
provider_name = "GCP"
Expand All @@ -36,7 +35,7 @@ resource "mongodbatlas_database_user" "mongo_user" {
}

# ip whitelist
resource "mongodbatlas_project_ip_whitelist" "test" {
resource "mongodbatlas_project_ip_access_list" "test" {
project_id = var.atlas_project_id
ip_address = google_compute_address.ip_address.address
}
1 change: 0 additions & 1 deletion terraform/cloudflare.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
provider "cloudflare" {
version = "~> 2.0"
api_token = var.cloudflare_api_token
}

Expand Down
3 changes: 1 addition & 2 deletions terraform/gcp.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ provider "google" {
project = var.gcp_project_id
region = "us-central1"
zone = "us-central1-c"
version = "~> 3.38"
}

# IP ADDRESS
Expand Down Expand Up @@ -33,7 +32,7 @@ resource "google_compute_firewall" "allow_http" {

# OS IMAGE
data "google_compute_image" "cos_image" {
family = "cos-81-lts"
family = "cos-97-lts"
project = "cos-cloud"
}

Expand Down
9 changes: 9 additions & 0 deletions terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,13 @@ terraform {
bucket = "devops-directive-storybooks-terraform"
prefix = "/state/storybooks"
}

required_providers {
mongodbatlas = {
source = "mongodb/mongodbatlas"
}
cloudflare = {
source = "cloudflare/cloudflare"
}
}
}
0