update Decidim v0.23.5

.cloudformation/cloud_front.yml

@@ -23,15 +23,6 @@ Parameters:
     Description: Type of this SSL id
     Type: String
 
-Metadata:
-  "AWS::CloudFormation::Interface":
-    ParameterGroups:
-      - Label:
-          default: "CloudFront"
-        Parameters:
-          - AlbDnsName
-          - ErrorCacheTTL
-
 Resources:
   # ------------------------------------------------------------#
   #  S3 Bucket
@@ -41,6 +32,14 @@ Resources:
     Properties:
       BucketName: !Sub ${AppEnvironment}-cfj-decidim-cloudfront-log
       AccessControl: LogDeliveryWrite
+      LifecycleConfiguration:
+        Rules:
+          - Id: !Sub ${AppEnvironment}-cfj-decidim-cloudfront-log-life-cycle
+            Status: Enabled
+            Prefix: logs/
+            Transitions:
+              - StorageClass: STANDARD_IA
+                TransitionInDays: 30
 
   # ------------------------------------------------------------#
   #  CloudFront
@@ -52,7 +51,7 @@ Resources:
         DefaultTTL: 600
         MinTTL: 60
         MaxTTL: 3600
-        Name: Decidim-Static-Cache-Policy
+        Name: !Sub ${AppEnvironment}-decidim-static-cache-policy
         ParametersInCacheKeyAndForwardedToOrigin:
           CookiesConfig:
             CookieBehavior: none
@@ -81,6 +80,7 @@ Resources:
             HTTPPort: 80
             HTTPSPort: 443
             OriginProtocolPolicy: https-only
+            OriginReadTimeout: 60
         DefaultCacheBehavior:
           AllowedMethods:
             - GET

.cloudformation/waf.yml

@@ -0,0 +1,89 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Description: "Create webAcl"
+
+Parameters:
+  AppEnvironment:
+    Description: Type of app environment.
+    Type: String
+    Default: staging
+    AllowedValues:
+      - staging
+      - production
+
+Resources:
+# ------------------------------------------------------------#
+# AWS WAFv2
+# ------------------------------------------------------------#
+  WebAclCloudFront:
+    Type: AWS::WAFv2::WebACL
+    Properties:
+      DefaultAction:
+        Allow: {}
+      Description: WebACL for CloudFront
+      Name: !Sub ${AppEnvironment}-cfj-decidim-web-acl
+      Rules:
+        - Name: !Sub ${AppEnvironment}-AWSManagedRulesCommonRuleSet
+          Priority: 0
+          OverrideAction:
+            Count: {}
+          VisibilityConfig:
+            SampledRequestsEnabled: true
+            CloudWatchMetricsEnabled: true
+            MetricName: AWSManagedRulesCommonRuleSetMetric
+          Statement:
+            ManagedRuleGroupStatement:
+              VendorName: AWS
+              Name: AWSManagedRulesCommonRuleSet
+        - Name: !Sub ${AppEnvironment}-AWSManagedRulesKnownBadInputsRuleSet
+          Priority: 1
+          OverrideAction:
+            Count: {}
+          VisibilityConfig:
+            SampledRequestsEnabled: true
+            CloudWatchMetricsEnabled: true
+            MetricName: AWSManagedRulesKnownBadInputsRuleSetMetric
+          Statement:
+            ManagedRuleGroupStatement:
+              VendorName: AWS
+              Name: AWSManagedRulesKnownBadInputsRuleSet
+        - Name: !Sub ${AppEnvironment}-AWSManagedRulesAmazonIpReputationList
+          Priority: 2
+          OverrideAction:
+            Count: {}
+          VisibilityConfig:
+            SampledRequestsEnabled: true
+            CloudWatchMetricsEnabled: true
+            MetricName: AWSManagedRulesAmazonIpReputationListMetric
+          Statement:
+            ManagedRuleGroupStatement:
+              VendorName: AWS
+              Name: AWSManagedRulesAmazonIpReputationList
+        - Name: !Sub ${AppEnvironment}-AWSManagedRulesLinuxRuleSet
+          Priority: 3
+          OverrideAction:
+            Count: {}
+          VisibilityConfig:
+            SampledRequestsEnabled: true
+            CloudWatchMetricsEnabled: true
+            MetricName: AWSManagedRulesLinuxRuleSetMetric
+          Statement:
+            ManagedRuleGroupStatement:
+              VendorName: AWS
+              Name: AWSManagedRulesLinuxRuleSet
+        - Name: !Sub ${AppEnvironment}-AWSManagedRulesSQLiRuleSet
+          Priority: 4
+          OverrideAction:
+            Count: {}
+          VisibilityConfig:
+            SampledRequestsEnabled: true
+            CloudWatchMetricsEnabled: true
+            MetricName: AWSManagedRulesSQLiRuleSetMetric
+          Statement:
+            ManagedRuleGroupStatement:
+              VendorName: AWS
+              Name: AWSManagedRulesSQLiRuleSet
+      Scope: CLOUDFRONT
+      VisibilityConfig:
+        SampledRequestsEnabled: true
+        CloudWatchMetricsEnabled: true
+        MetricName: !Sub ${AppEnvironment}-cfj-decidim-web-acl

.github/workflows/deploy.yml

@@ -30,8 +30,8 @@ jobs:
         id: set-env-production
         if: endsWith(github.ref, 'heads/master') || contains(github.ref, 'tags/v')
         run: |
-          echo "IMAGE_TAG_PREFIX=production" >> $GITHUB_ENV
-          echo "EB_ENVIRONMENT_NAME=production" >> $GITHUB_ENV
+          echo "IMAGE_TAG_PREFIX=production-v0-23-5" >> $GITHUB_ENV
+          echo "EB_ENVIRONMENT_NAME=production-v0-23-5" >> $GITHUB_ENV
 
       - name: Output App Env
         id: output-app-env

.github/workflows/rails-test.yml

@@ -32,10 +32,10 @@ jobs:
       run: |
         sudo apt-get update -y
         sudo apt-get -yqq install libpq-dev postgresql-client
-    - name: Set up Ruby 2.6
+    - name: Set up Ruby 2.7
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 2.7
         bundler-cache: true
     - name: Build and Test with RSpec
       env:

.rubocop.yml

@@ -14,6 +14,7 @@ AllCops:
     - "development_app/**/*"
     - "spec/decidim_dummy_app/**/*"
     - "node_modules/**/*"
+    - "**/node_modules/**/*"
     - "db/migrate/*"
     - "db/schema.rb"
   # Default formatter will be used if no -f/--format option is given.
@@ -65,7 +66,7 @@ AllCops:
   # If a value is specified for TargetRubyVersion then it is used.
   # Else if .ruby-version exists and it contains an MRI version it is used.
   # Otherwise we fallback to the oldest officially supported Ruby version (2.0).
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
 
   RSpec:
     Patterns:

.ruby-version

@@ -1 +1 @@
-2.6.6
+2.7.4

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## [v0.23.0-2021-08-07-01](https://github.com/codeforjapan/decidim-cfj/releases/tag/v0.23.0-2021-08-07-01)
+
+### Fixed
+- Fix locale file: decidim.errors.not_found.content_doesnt_exist [#262](https://github.com/codeforjapan/decidim-cfj/pull/262)
+- Fix #268; add locale for debate_closed [#269](https://github.com/codeforjapan/decidim-cfj/pull/269)
+- Fix fallbacks of i18n; use both :ja and :en [#270](https://github.com/codeforjapan/decidim-cfj/pull/270)
+
+### Developer improvements
+- fix typo decidem -> decidim on NEW_RELIC_APP_NAME [#248](https://github.com/codeforjapan/decidim-cfj/pull/248)
+- enabled spot instance on staging environment [#251](https://github.com/codeforjapan/decidim-cfj/pull/251)
+- add VPC & subnets Cloud Formation & INFRA.md [#249](https://github.com/codeforjapan/decidim-cfj/pull/249)
+- add environment variable by SSM on ebextensions [#245](https://github.com/codeforjapan/decidim-cfj/pull/245)
+- Turn off New Relic except production [#258](https://github.com/codeforjapan/decidim-cfj/pull/258)
+- change auto scale trigger to Average from Maximum [#265](https://github.com/codeforjapan/decidim-cfj/pull/265)
+
+## [v0.23.0-2021-07-28](https://github.com/codeforjapan/decidim-cfj/releases/tag/v0.23.0-2021-07-28)
+
+### Developer improvements
+- Update robots txt [#266](https://github.com/codeforjapan/decidim-cfj/pull/266)
+
 ## [v0.23.0-2021-06-22](https://github.com/codeforjapan/decidim-cfj/releases/tag/v0.23.0-2021-06-22)
 
 ### Developer improvements

Dockerfile

@@ -1,6 +1,6 @@
 FROM node:10.23.0-alpine as node
 
-FROM ruby:2.6.6-alpine
+FROM ruby:2.7.4-alpine
 
 RUN apk update \
     && apk add --no-cache --virtual build-dependencies \

Gemfile

@@ -4,11 +4,15 @@ source "https://rubygems.org"
 
 ruby RUBY_VERSION
 
-gem "decidim", git: "https://github.com/decidim/decidim.git", branch: "release/0.23-stable"
+gem "decidim", "0.23.5"
 
-# gem "decidim", "0.21"
-# gem "decidim-consultations", "0.23.0.dev"
-# gem "decidim-initiatives", "0.23.0.dev"
+# gem "decidim", "0.23.5"
+# gem "decidim-consultations", "0.23.5"
+# gem "decidim-initiatives", "0.23.5"
+
+gem "decidim-comments", path: "decidim-comments"
+
+gem "decidim-decidim_awesome", "~> 0.7.0"
 
 gem "bootsnap", "~> 1.3"
 
@@ -31,7 +35,7 @@ group :development, :test do
   gem "byebug", "~> 11.0", platform: :mri
   gem "figaro"
 
-  gem "decidim-dev", git: "https://github.com/decidim/decidim.git", branch: "release/0.23-stable"
+  gem "decidim-dev", "0.23.5"
   gem "dotenv-rails"
   gem "factory_bot_rails"
   gem "rspec-rails"