update other references to google env variables and hyrax analytics i…

…mplementations

app/services/hyrax/analytics/google.rb

@@ -12,7 +12,7 @@ module Google
       extend ActiveSupport::Concern
       # rubocop:disable Metrics/BlockLength
       class_methods do
-        # Loads configuration options from config/analytics.yml. You only need PRIVATE_KEY_PATH or
+        # Loads configuration options from config/analytics.yml for Hyrax apps only. You only need PRIVATE_KEY_PATH or
         # PRIVATE_KEY_VALUE. VALUE takes precedence.
         # Expected structure:
         # `analytics:`

bin/web

@@ -1,6 +1,2 @@
 #!/usr/local/bin/ruby
-if ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] && !ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].empty?
-  %x{echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12}
-end
-
 exec "bundle exec puma -v -b tcp://0.0.0.0:3000"

bin/worker

@@ -1,8 +1,4 @@
 #!/usr/local/bin/ruby
-if ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] && !ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].empty?
-  %x{echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12}
-end
-
 if ENV['DB_URL'] && !ENV['DB_URL'].empty?
   ENV['DB_URL'] = ENV['DB_URL'].gsub('pool=5', 'pool=30')
 else

config/analytics.yml

@@ -1,12 +1,12 @@
 #
 # To integrate your app with Google Analytics, uncomment the lines below and add your API key information.
 #
-analytics:
-  google:
-    analytics_id: <%= ENV['GOOGLE_ANALYTICS_ID'] %>
-    app_name: <%= ENV['GOOGLE_OAUTH_APP_NAME'] %>
-    app_version: <%= ENV['GOOGLE_OAUTH_APP_VERSION'] %>
-    privkey_value: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] %>
-    # OR privkey_path: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_PATH'] %>
-    privkey_secret: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_SECRET'] %>
-    client_email: <%= ENV['GOOGLE_OAUTH_CLIENT_EMAIL'] %>
+# analytics:
+#   google:
+#     analytics_id: <%= ENV['GOOGLE_ANALYTICS_ID'] %>
+#     app_name: <%= ENV['GOOGLE_OAUTH_APP_NAME'] %>
+#     app_version: <%= ENV['GOOGLE_OAUTH_APP_VERSION'] %>
+#     privkey_value: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] %>
+#     # OR privkey_path: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_PATH'] %>
+#     privkey_secret: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_SECRET'] %>
+#     client_email: <%= ENV['GOOGLE_OAUTH_CLIENT_EMAIL'] %>

config/browse_everything_providers.yml

@@ -12,8 +12,8 @@ file_system:
 #   :client_id: YOUR_BOX_CLIENT_ID
 #   :client_secret: YOUR_BOX_CLIENT_SECRET
 # google_drive:
-#   :client_id: YOUR_GOOGLE_API_CLIENT_ID
-#   :client_secret: YOUR_GOOGLE_API_CLIENT_SECRET
+#   :client_id: YOUR_ANALYTICS_API_CLIENT_ID
+#   :client_secret: YOUR_ANALYTICS_API_CLIENT_SECRET
 # sky_drive:
 #   :client_id: YOUR_MS_LIVE_CONNECT_CLIENT_ID
 #   :client_secret: YOUR_MS_LIVE_CONNECT_CLIENT_SECRET

ops/staging-deploy.tmpl.yaml

@@ -86,19 +86,19 @@ extraEnvVars: &envVars
     value: http://fcrepo.staging-fcrepo.svc.cluster.local:8080/rest
   - name: GOOGLE_FONTS_KEY
     value: $GOOGLE_FONTS_KEY
-  # - name: GOOGLE_ANALYTICS_ID
-  #   value: $GOOGLE_ANALYTICS_ID  # Set in GitHub Environment Variables Section
-  # - name: GOOGLE_OAUTH_APP_NAME
+  # - name: ANALYTICS_ID
+  #   value: $ANALYTICS_ID # Refer to the README
+  # - name: ANALYTICS_OAUTH_APP_NAME
   #   value: palni-palci-demo
-  # - name: GOOGLE_OAUTH_APP_VERSION
+  # - name: ANALYTICS_OAUTH_APP_VERSION
   #   value: '1.0'
-  # - name: GOOGLE_OAUTH_PRIVATE_KEY_SECRET
-  #   value: $GOOGLE_OAUTH_PRIVATE_KEY_SECRET # Set in GitHub Environment Variables Section
-  # - name: GOOGLE_OAUTH_PRIVATE_KEY_PATH
+  # - name: ANALYTICS_OAUTH_PRIVATE_KEY_SECRET
+  #   value: $ANALYTICS_OAUTH_PRIVATE_KEY_SECRET # Refer to the README
+  # - name: ANALYTICS_OAUTH_PRIVATE_KEY_PATH
   #   value: prod-cred.p12
-  # - name: GOOGLE_OAUTH_PRIVATE_KEY_VALUE
-  #   value: $GOOGLE_OAUTH_PRIVATE_KEY_VALUE
-  # - name: GOOGLE_OAUTH_CLIENT_EMAIL
+  # - name: ANALYTICS_OAUTH_PRIVATE_KEY_VALUE
+  #   value: $ANALYTICS_OAUTH_PRIVATE_KEY_VALUE # Refer to the README
+  # - name: ANALYTICS_OAUTH_CLIENT_EMAIL
   #   value: [email protected]
   - name: HYKU_ACTIVE_JOB_QUEUE_URL
     value: sidekiq