tpt-rails 1.2.2 → 1.4.2

data/lib/tpt/rails/version.rb

@@ -1,5 +1,6 @@
 module Tpt
   module Rails
-    VERSION = '1.2.2'
+    # Do not change this manually. Our tooling will do it automatically.
+    VERSION = '1.4.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tpt-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.4.2
 platform: ruby
 authors:
 - TpT
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.1.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2.1
+        version: 6.1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.1.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2.1
+        version: 6.1.3.2
 - !ruby/object:Gem::Dependency
   name: dogstatsd-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.40'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.40'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -72,8 +72,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -91,34 +91,29 @@ files:
 - app/models/tpt/rails/application_record.rb
 - app/views/layouts/tpt/rails/application.html.erb
 - config/routes.rb
-- lib/generators/tpt_rails/configuration/configuration_generator.rb
-- lib/generators/tpt_rails/configuration/templates/config/initializers/tpt_rails.rb
-- lib/generators/tpt_rails/continuous_integration/continuous_integration_generator.rb
-- lib/generators/tpt_rails/continuous_integration/templates/ci/Dockerfile.tt
-- lib/generators/tpt_rails/continuous_integration/templates/ci/docker-compose.yaml.tt
-- lib/generators/tpt_rails/continuous_integration/templates/ci/tasks/project.test.unit
-- lib/generators/tpt_rails/continuous_integration/templates/ci/test.Jenkinsfile.tt
-- lib/generators/tpt_rails/continuous_integration/templates/ci/test.config.xml.tt
-- lib/generators/tpt_rails/continuous_integration/templates/ci/tptcd.Jenkinsfile.tt
-- lib/generators/tpt_rails/continuous_integration/templates/ci/tptci.Jenkinsfile.tt
-- lib/generators/tpt_rails/kubernetes/kubernetes_generator.rb
-- lib/generators/tpt_rails/kubernetes/templates/Dockerfile.tt
-- lib/generators/tpt_rails/kubernetes/templates/entrypoint.sh
-- lib/generators/tpt_rails/kubernetes/templates/kubernetes/helm/Chart.yaml.tt
-- lib/generators/tpt_rails/kubernetes/templates/kubernetes/helm/README.md
-- lib/generators/tpt_rails/kubernetes/templates/kubernetes/helm/requirements.yaml.tt
-- lib/generators/tpt_rails/kubernetes/templates/kubernetes/helm/templates/NOTES.txt.tt
-- lib/generators/tpt_rails/kubernetes/templates/kubernetes/helm/templates/_env.yaml
-- lib/generators/tpt_rails/kubernetes/templates/kubernetes/helm/templates/_helpers.tpl.tt
-- lib/generators/tpt_rails/kubernetes/templates/kubernetes/helm/templates/autoscaler.yaml.tt
-- lib/generators/tpt_rails/kubernetes/templates/kubernetes/helm/templates/deployment.yaml.tt
-- lib/generators/tpt_rails/kubernetes/templates/kubernetes/helm/templates/hooks/db-migrate.yaml.tt
-- lib/generators/tpt_rails/kubernetes/templates/kubernetes/helm/templates/service.yaml.tt
-- lib/generators/tpt_rails/kubernetes/templates/kubernetes/helm/values.prod.yaml.tt
-- lib/generators/tpt_rails/kubernetes/templates/kubernetes/helm/values.staging.yaml.tt
-- lib/generators/tpt_rails/kubernetes/templates/kubernetes/helm/values.yaml.tt
-- lib/generators/tpt_rails/postman/postman.yaml.tt
-- lib/tasks/tpt/rails_tasks.rake
+- lib/generators/tpt/rails/configuration/configuration_generator.rb
+- lib/generators/tpt/rails/configuration/templates/config/initializers/tpt_rails.rb
+- lib/generators/tpt/rails/continuous_integration/continuous_integration_generator.rb
+- lib/generators/tpt/rails/continuous_integration/templates/ci/Dockerfile.tt
+- lib/generators/tpt/rails/continuous_integration/templates/ci/docker-compose.yaml.tt
+- lib/generators/tpt/rails/continuous_integration/templates/ci/tasks/project.test.unit.tt
+- lib/generators/tpt/rails/kubernetes/kubernetes_generator.rb
+- lib/generators/tpt/rails/kubernetes/templates/Dockerfile.tt
+- lib/generators/tpt/rails/kubernetes/templates/entrypoint.sh
+- lib/generators/tpt/rails/kubernetes/templates/kubernetes/helm/Chart.yaml.tt
+- lib/generators/tpt/rails/kubernetes/templates/kubernetes/helm/README.md
+- lib/generators/tpt/rails/kubernetes/templates/kubernetes/helm/requirements.yaml.tt
+- lib/generators/tpt/rails/kubernetes/templates/kubernetes/helm/templates/NOTES.txt.tt
+- lib/generators/tpt/rails/kubernetes/templates/kubernetes/helm/templates/_env.yaml
+- lib/generators/tpt/rails/kubernetes/templates/kubernetes/helm/templates/_helpers.tpl.tt
+- lib/generators/tpt/rails/kubernetes/templates/kubernetes/helm/templates/autoscaler.yaml.tt
+- lib/generators/tpt/rails/kubernetes/templates/kubernetes/helm/templates/deployment.yaml.tt
+- lib/generators/tpt/rails/kubernetes/templates/kubernetes/helm/templates/hooks/db-prepare.yaml.tt
+- lib/generators/tpt/rails/kubernetes/templates/kubernetes/helm/templates/service.yaml.tt
+- lib/generators/tpt/rails/kubernetes/templates/kubernetes/helm/values.prod.yaml.tt
+- lib/generators/tpt/rails/kubernetes/templates/kubernetes/helm/values.staging.yaml.tt
+- lib/generators/tpt/rails/kubernetes/templates/kubernetes/helm/values.yaml.tt
+- lib/generators/tpt/rails/postman/postman.yaml.tt
 - lib/tpt/rails.rb
 - lib/tpt/rails/config.rb
 - lib/tpt/rails/engine.rb
@@ -132,7 +127,7 @@ homepage: https://github.com/TeachersPayTeachers/tpt-rails
 licenses:
 - Nonstandard
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,8 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Utils for TpT Rails apps
 test_files: []

data/lib/generators/tpt_rails/configuration/templates/config/initializers/tpt_rails.rb

@@ -1,10 +0,0 @@
-Tpt::Rails.configure do |config|
-  config.app_name = ENV.fetch('APP_NAME')
-  config.app_env = ENV.fetch('APP_ENV')
-  if ENV['DOGSTATSD_URL'].present?
-    config.datadog_statsd_url = ENV.fetch('DOGSTATSD_URL')
-  end
-  if ENV['DATADOG_TRACE_URL'].present?
-    config.datadog_trace_url = ENV.fetch('DATADOG_TRACE_URL')
-  end
-end

data/lib/generators/tpt_rails/continuous_integration/continuous_integration_generator.rb

@@ -1,17 +0,0 @@
-class Tpt::Rails::ContinuousIntegrationGenerator < ::Rails::Generators::Base
-  source_root File.expand_path('templates', __dir__)
-
-  def setup_continuous_integration
-    # TODO: should we run tpt cli to generate `test.config.xml`?
-    # TODO: ask nathan about the test/tptcd/tptci files
-    directory('ci')
-
-    say(<<~MESSAGE)
-      …note about running `tpt ci run protect.test.unit` to run tests
-      
-      You need to ask dev tools to create a credential in jenkins. Example ticket:
-      https://teacherspayteachers.atlassian.net/browse/DEVT-710
-    
-    MESSAGE
-  end
-end

data/lib/generators/tpt_rails/continuous_integration/templates/ci/Dockerfile.tt

@@ -1,31 +0,0 @@
-FROM teacherspayteachers/tptci as tptci
-FROM ruby:<%= RUBY_VERSION %>
-
-RUN mkdir -p /app
-WORKDIR /app
-
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash \
-  && apt-get update && apt-get install -y nodejs && rm -rf /var/lib/apt/lists/* \
-  && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-  && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-  && apt-get update && apt-get install -y yarn && apt-get install -y netcat && rm -rf /var/lib/apt/lists/*
-
-COPY package.json yarn.lock /app/
-RUN yarn install --check-files
-
-ENV RAILS_ENV test
-ENV APP_ENV test
-ENV APP_NAME <%= Tpt::Rails.app_name %>
-
-# GITHUB_TOKEN allows accessing our private tpt-rails gem on Github
-ARG GITHUB_TOKEN
-
-COPY Gemfile /app/Gemfile
-COPY Gemfile.lock /app/Gemfile.lock
-# TODO: Do we need this? Can we move it into a base image?
-RUN gem update bundler
-RUN BUNDLE_GITHUB__COM="${GITHUB_TOKEN}:x-oauth-basic" bundle install
-
-COPY . .
-
-COPY --from=tptci /usr/bin/tptci /usr/bin/tptci

data/lib/generators/tpt_rails/continuous_integration/templates/ci/tasks/project.test.unit

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-until nc -z -v ${MYSQL_HOSTNAME} ${MYSQL_PORT}
-do
-  echo "Waiting for database connection..."
-  sleep 5
-done
-
-exec bin/rails db:prepare test
-
-# Uncomment to run system tests
-# exec bin/rails test:system

data/lib/generators/tpt_rails/continuous_integration/templates/ci/test.Jenkinsfile.tt

@@ -1,40 +0,0 @@
-@Library('tpt-pipeline-library') _
-
-def ci = new tpt.CI(this)
-ci.project = '<%= Tpt::Rails.app_name %>'
-
-pipeline {
-  agent {
-    label 'docker-node'
-  }
-
-  environment {
-    GITHUB_TOKEN = credentials('24caddab-590e-467f-a1d2-1c0c1864d628')
-  }
-
-  stages {
-    stage('Start') {
-      steps {
-        startBuild(ci)
-      }
-    }
-
-    stage('Build') {
-      steps {
-        dockerComposeBuild(ci)
-      }
-    }
-
-    stage('Unit Test') {
-      steps {
-        dockerComposeRun(ci, "tests", './ci/tasks/project.test.unit')
-      }
-    }
-  }
-
-  post {
-    always {
-      finishBuild(ci, currentBuild.currentResult)
-    }
-  }
-}

data/lib/generators/tpt_rails/continuous_integration/templates/ci/test.config.xml.tt

@@ -1,76 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?><org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject plugin="workflow-multibranch@2.21">
-  <actions/>
-  <description></description>
-  <displayName><%= Tpt::Rails.app_name %>-test</displayName>
-  <properties>
-    <org.jenkinsci.plugins.workflow.libs.FolderLibraries plugin="workflow-cps-global-lib@2.13">
-      <libraries>
-        <org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>
-          <name>jenkins-pipeline-library</name>
-          <retriever class="org.jenkinsci.plugins.workflow.libs.SCMSourceRetriever">
-            <scm class="jenkins.plugins.git.GitSCMSource" plugin="git@3.9.3">
-              <id>31643265-3634-6665-6262-343134326436</id>
-              <remote>git@github.com:TeachersPayTeachers/jenkins-pipeline-library.git</remote>
-              <credentialsId>jenkins-master-rsa-key</credentialsId>
-              <traits>
-                <jenkins.plugins.git.traits.BranchDiscoveryTrait/>
-              </traits>
-            </scm>
-          </retriever>
-          <implicit>false</implicit>
-          <allowVersionOverride>true</allowVersionOverride>
-          <includeInChangesets>true</includeInChangesets>
-        </org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>
-      </libraries>
-    </org.jenkinsci.plugins.workflow.libs.FolderLibraries>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.7">
-      <dockerLabel/>
-      <registry plugin="docker-commons@1.14"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
-  </properties>
-  <folderViews class="jenkins.branch.MultiBranchProjectViewHolder" plugin="branch-api@2.4.0">
-    <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/>
-  </folderViews>
-  <healthMetrics>
-    <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric plugin="cloudbees-folder@6.8">
-      <nonRecursive>false</nonRecursive>
-    </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
-    <jenkins.branch.PrimaryBranchHealthMetric plugin="branch-api@2.4.0"/>
-  </healthMetrics>
-  <icon class="jenkins.branch.MetadataActionFolderIcon" plugin="branch-api@2.4.0">
-    <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/>
-  </icon>
-  <orphanedItemStrategy class="com.cloudbees.hudson.plugins.folder.computed.DefaultOrphanedItemStrategy" plugin="cloudbees-folder@6.8">
-    <pruneDeadBranches>true</pruneDeadBranches>
-    <daysToKeep>-1</daysToKeep>
-    <numToKeep>5</numToKeep>
-  </orphanedItemStrategy>
-  <triggers/>
-  <disabled>false</disabled>
-  <sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api@2.4.0">
-    <data>
-      <jenkins.branch.BranchSource>
-        <source class="org.jenkinsci.plugins.github_branch_source.GitHubSCMSource" plugin="github-branch-source@2.4.5">
-          <id>65633436-6138-6163-6638-323663356636</id>
-          <credentialsId>tpt-github-source-credential</credentialsId>
-          <repoOwner>TeachersPayTeachers</repoOwner>
-          <repository><%= Tpt::Rails.app_name %></repository>
-          <traits>
-            <org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait>
-              <strategyId>3</strategyId>
-            </org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait>
-            <org.jenkinsci.plugins.github__branch__source.TagDiscoveryTrait/>
-          </traits>
-        </source>
-        <strategy class="jenkins.branch.DefaultBranchPropertyStrategy">
-          <properties class="empty-list"/>
-        </strategy>
-      </jenkins.branch.BranchSource>
-    </data>
-    <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/>
-  </sources>
-  <factory class="org.jenkinsci.plugins.workflow.multibranch.WorkflowBranchProjectFactory">
-    <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/>
-    <scriptPath>ci/test.Jenkinsfile</scriptPath>
-  </factory>
-</org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject>

data/lib/generators/tpt_rails/continuous_integration/templates/ci/tptcd.Jenkinsfile.tt

@@ -1,7 +0,0 @@
-@Library('tpt-pipeline-library') _
-
-def ci = new tpt.CI(this)
-ci.project = '<%= Tpt::Rails.app_name %>'
-ci.buildCredentials = [[ id: '<%= Tpt::Rails.app_name %>-rails-master-key', var: '<%= Tpt::Rails.app_name.underscore.upcase %>_RAILS_MASTER_KEY' ]]
-
-tptcdPipeline(ci: ci)

data/lib/generators/tpt_rails/continuous_integration/templates/ci/tptci.Jenkinsfile.tt

@@ -1,7 +0,0 @@
-@Library('tpt-pipeline-library') _
-
-def ci = new tpt.CI(this)
-ci.project = '<%= Tpt::Rails.app_name %>'
-ci.buildCredentials = [[ id: '<%= Tpt::Rails.app_name %>-rails-master-key', var: '<%= Tpt::Rails.app_name.underscore.upcase %>_RAILS_MASTER_KEY' ]]
-
-tptciPipeline(ci: ci, ode: '') // we don't need an ode, just test this service

data/lib/generators/tpt_rails/kubernetes/templates/Dockerfile.tt

@@ -1,41 +0,0 @@
-FROM ruby:<%= RUBY_VERSION %>
-
-RUN mkdir /app
-WORKDIR /app
-
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash \
-  && apt-get update && apt-get install -y nodejs && rm -rf /var/lib/apt/lists/* \
-  && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-  && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-  && apt-get update && apt-get install -y yarn && rm -rf /var/lib/apt/lists/*
-
-COPY package.json yarn.lock /app/
-RUN yarn install --check-files
-
-# Set production env for asset compilation
-ARG RAILS_ENV=production
-ARG APP_ENV=production
-ARG APP_NAME=<%= Tpt::Rails.app_name %>
-
-ARG <%= Tpt::Rails.app_name.underscore.upcase %>_RAILS_MASTER_KEY
-# GITHUB_TOKEN allows accessing our private tpt-rails gem on Github
-ARG GITHUB_TOKEN
-
-COPY Gemfile /app/Gemfile
-COPY Gemfile.lock /app/Gemfile.lock
-RUN gem update bundler
-RUN BUNDLE_GITHUB__COM="${GITHUB_TOKEN}:x-oauth-basic" bundle install --without development test
-
-# Add a script to be executed every time the container starts.
-COPY entrypoint.sh /usr/bin/
-RUN chmod +x /usr/bin/entrypoint.sh
-
-ADD . /app
-
-RUN RAILS_MASTER_KEY=${<%= Tpt::Rails.app_name.underscore.upcase %>_RAILS_MASTER_KEY} bin/rails assets:precompile
-
-EXPOSE 3000
-
-# TODO: Delete this?
-ENTRYPOINT ["entrypoint.sh"]
-CMD ["rails", "server", "-b", "0.0.0.0"]

data/lib/generators/tpt_rails/kubernetes/templates/entrypoint.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-if [ -f /app/tmp/pids/server.pid ]; then
-  rm /app/tmp/pids/server.pid
-fi
-
-echo "Preparing database"
-# In Kubernetes this should always be a no-op because our migration hook will already have run.
-rails db:prepare
-
-echo "Starting server"
-exec "$@"

data/lib/generators/tpt_rails/kubernetes/templates/kubernetes/helm/requirements.yaml.tt

@@ -1,8 +0,0 @@
-dependencies:
-  - name: mysql
-    version: 1.3.0
-    repository: '@stable'
-  - name: copy-secrets
-    version: ~1.1.0
-    repository: https://chartmuseum.tptpm.info
-    condition: copy-secrets.enabled

data/lib/generators/tpt_rails/kubernetes/templates/kubernetes/helm/values.prod.yaml.tt

@@ -1,52 +0,0 @@
-name: <%= Tpt::Rails.app_name %>
-deploy_env: production
-
-image:
-  name: <%= Tpt::Rails.app_name %>
-  repository: <%= Tpt::Rails.app_name %>
-  tag: latest
-  pullPolicy: Always
-
-environment:
-  ENVIRONMENT: production
-  APP_ENV: production
-  RAILS_ENV: production
-
-postgresql:
-  enabled: false
-
-copy-secrets:
-  enabled: false
-
-redis:
-  enabled: false
-
-secrets:
-  - name: RAILS_MASTER_KEY
-    valueFrom:
-      secretKeyRef:
-        name: <%= Tpt::Rails.app_name %>-secrets
-        key: rails-master-key
-  - name: DATABASE_URL
-    valueFrom:
-      secretKeyRef:
-        name: <%= Tpt::Rails.app_name %>-secrets
-        # To set up a staging/prod DB:
-        # - Create the DB in the TpT terraform repo
-        # - Use the root DB account to create an application DB user
-        # - Create a kube secret (e.g. prod-resource-catalog-db-url) with the DATABASE_URL
-        #   (including the application user credentials)
-        # - Update the key below to reference your secret
-        key: 'FIXME'
-
-autoscaler:
-  minimumPods: 3
-  maximumPods: 6
-  targetCPUUtilizationPercentage: 70
-
-rollingUpdate:
-  maxSurge: 25%
-
-# Create ELB
-# service:
-#   type: LoadBalancer