From 664f8180425386da511436e864810535fcdc75e5 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 5 May 2021 14:18:15 +0200
Subject: ci: Remove unused Gitlab and Travis CI configurations

---
 opendc-web/opendc-web-api/.gitlab-ci.yml | 26 --------------------------
 opendc-web/opendc-web-ui/.travis.yml     |  9 ---------
 2 files changed, 35 deletions(-)
 delete mode 100644 opendc-web/opendc-web-api/.gitlab-ci.yml
 delete mode 100644 opendc-web/opendc-web-ui/.travis.yml

(limited to 'opendc-web')

diff --git a/opendc-web/opendc-web-api/.gitlab-ci.yml b/opendc-web/opendc-web-api/.gitlab-ci.yml
deleted file mode 100644
index d80ba836..00000000
--- a/opendc-web/opendc-web-api/.gitlab-ci.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-image: "python:3.8"
-
-variables:
-  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
-
-cache:
-  paths:
-    - .cache/pip
-
-stages:
-  - static-analysis
-  - test
-
-static-analysis:
-  stage: static-analysis
-  script:
-    - python --version
-    - pip install -r requirements.txt
-    - pylint opendc
-
-test:
-  stage: test
-  script:
-    - python --version
-    - pip install -r requirements.txt
-    - pytest opendc
diff --git a/opendc-web/opendc-web-ui/.travis.yml b/opendc-web/opendc-web-ui/.travis.yml
deleted file mode 100644
index c3554fe4..00000000
--- a/opendc-web/opendc-web-ui/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: node_js
-node_js:
-  - 10
-cache:
-  directories:
-    - node_modules
-script:
-  - npm run build
-  - npm test
-- 
cgit v1.2.3


From 3c805a50ca710e123aa18ad1bfa01ea4f1ee40d2 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 5 May 2021 14:28:20 +0200
Subject: build: Update Docker ignores to prevent unnecessary builds

This changes updates the .dockerignore files in the repository in order
to prevent building when not necessary.
---
 opendc-web/opendc-web-api/.dockerignore | 8 ++++++++
 opendc-web/opendc-web-ui/.dockerignore  | 7 +++++++
 2 files changed, 15 insertions(+)
 create mode 100644 opendc-web/opendc-web-api/.dockerignore

(limited to 'opendc-web')

diff --git a/opendc-web/opendc-web-api/.dockerignore b/opendc-web/opendc-web-api/.dockerignore
new file mode 100644
index 00000000..06d67de9
--- /dev/null
+++ b/opendc-web/opendc-web-api/.dockerignore
@@ -0,0 +1,8 @@
+Dockerfile
+
+.idea/
+**/out
+*.iml
+.idea_modules/
+
+.pytest_cache
diff --git a/opendc-web/opendc-web-ui/.dockerignore b/opendc-web/opendc-web-ui/.dockerignore
index dd87e2d7..b91894f6 100644
--- a/opendc-web/opendc-web-ui/.dockerignore
+++ b/opendc-web/opendc-web-ui/.dockerignore
@@ -1,2 +1,9 @@
+Dockerfile
+
+.idea/
+**/out
+*.iml
+.idea_modules/
+
 node_modules
 build
-- 
cgit v1.2.3


From e8bb95cb35ed1b02a85cf7cbea5bfc20fe0324c2 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 5 May 2021 14:50:38 +0200
Subject: build: Support runtime variables in frontend Docker image

This change adds support for dynamically specifying various variables
for the frontend Docker image through environmental variables.
Previously, these were embedded directly into the source code, which
requires rebuilding the entire image to change these variables.
---
 opendc-web/opendc-web-ui/Dockerfile                   | 17 ++++++-----------
 opendc-web/opendc-web-ui/public/index.html            |  9 ++++++++-
 opendc-web/opendc-web-ui/scripts/envsubst-html.sh     | 19 +++++++++++++++++++
 .../opendc-web-ui/src/api/routes/token-signin.js      |  2 +-
 opendc-web/opendc-web-ui/src/api/socket.js            |  2 +-
 opendc-web/opendc-web-ui/src/containers/auth/Login.js |  6 +++---
 opendc-web/opendc-web-ui/src/index.js                 |  5 +++--
 7 files changed, 41 insertions(+), 19 deletions(-)
 create mode 100755 opendc-web/opendc-web-ui/scripts/envsubst-html.sh

(limited to 'opendc-web')

diff --git a/opendc-web/opendc-web-ui/Dockerfile b/opendc-web/opendc-web-ui/Dockerfile
index 20e16b08..7aa3a7bf 100644
--- a/opendc-web/opendc-web-ui/Dockerfile
+++ b/opendc-web/opendc-web-ui/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14 AS staging
+FROM node:15 AS staging
 MAINTAINER OpenDC Maintainers <opendc@atlarge-research.com>
 
 # Copy package details
@@ -6,21 +6,16 @@ COPY ./package.json ./yarn.lock /opendc/
 RUN cd /opendc && yarn
 
 # Build frontend
-FROM node:14 AS build
-
-ARG OPENDC_OAUTH_CLIENT_ID
-ARG OPENDC_API_BASE_URL
-ARG OPENDC_FRONTEND_SENTRY_DSN
+FROM node:15 AS build
 
 COPY ./ /opendc
 COPY --from=staging /opendc/node_modules /opendc/node_modules
 RUN cd /opendc/ \
-    && export REACT_APP_OAUTH_CLIENT_ID=$OPENDC_OAUTH_CLIENT_ID \
-    && export REACT_APP_API_BASE_URL=$OPENDC_API_BASE_URL \
-    && export REACT_APP_SENTRY_DSN=$OPENDC_FRONTEND_SENTRY_DSN \
-    && yarn build
+    && yarn build \
+    && mv build/index.html build/index.html.template
 
 # Setup nginx to serve the frontend
-FROM nginx:1.19
+FROM nginx:1.20
+COPY --from=build /opendc/scripts/envsubst-html.sh /docker-entrypoint.d/00-envsubst-html.sh
 COPY --from=build /opendc/build /usr/share/nginx/html
 COPY nginx.conf /etc/nginx/conf.d/default.conf
diff --git a/opendc-web/opendc-web-ui/public/index.html b/opendc-web/opendc-web-ui/public/index.html
index 44a0d80f..da734797 100644
--- a/opendc-web/opendc-web-ui/public/index.html
+++ b/opendc-web/opendc-web-ui/public/index.html
@@ -33,7 +33,7 @@
     <meta property="og:locale" content="en_US">
 
     <!-- Google meta tags -->
-    <meta name="google-signin-client_id" content="%REACT_APP_OAUTH_CLIENT_ID%">
+    <meta name="google-signin-client_id" content="$OAUTH_CLIENT_ID">
     <meta name="google-site-verification" content="YIR4LkQTv6WmOdWv8MkeiUKni-0Yu3WHylLp4VvUMig"/>
 
     <!-- CDN dependencies -->
@@ -52,6 +52,13 @@
         gtag('js', new Date())
         gtag('config', 'UA-84285092-3')
     </script>
+    <script>
+        window.$$env = {
+            API_BASE_URL: "$API_BASE_URL",
+            OAUTH_CLIENT_ID: "$OAUTH_CLIENT_ID",
+            SENTRY_DSN: "$SENTRY_DSN",
+        };
+    </script>
 </head>
 <body>
 <noscript>
diff --git a/opendc-web/opendc-web-ui/scripts/envsubst-html.sh b/opendc-web/opendc-web-ui/scripts/envsubst-html.sh
new file mode 100755
index 00000000..8ca12e8a
--- /dev/null
+++ b/opendc-web/opendc-web-ui/scripts/envsubst-html.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+# We can use simple version of envsubst execution as
+# envsubst < /usr/share/nginx/html/index.html.template > /usr/share/nginx/html/index.html
+# but it replaces everything that looks like environment variable substitution
+# so it affects `default values` approach.
+# we need to replace only provided environment variables.
+
+auto_envsubst() {
+  template_path="/usr/share/nginx/html/index.html.template"
+  output_path="/usr/share/nginx/html/index.html"
+  defined_envs=$(printf '${%s} ' $(env | cut -d= -f1))
+  envsubst "$defined_envs" < "$template_path" > "$output_path"
+}
+
+auto_envsubst
+exit 0
diff --git a/opendc-web/opendc-web-ui/src/api/routes/token-signin.js b/opendc-web/opendc-web-ui/src/api/routes/token-signin.js
index d6cff570..e40127f2 100644
--- a/opendc-web/opendc-web-ui/src/api/routes/token-signin.js
+++ b/opendc-web/opendc-web-ui/src/api/routes/token-signin.js
@@ -1,5 +1,5 @@
 export function performTokenSignIn(token) {
-    const apiUrl = process.env.REACT_APP_API_BASE_URL || ''
+    const apiUrl = window.$$env['API_BASE_URL'] || ''
 
     return fetch(`${apiUrl}/tokensignin`, {
         method: 'POST',
diff --git a/opendc-web/opendc-web-ui/src/api/socket.js b/opendc-web/opendc-web-ui/src/api/socket.js
index 1c432167..884c4152 100644
--- a/opendc-web/opendc-web-ui/src/api/socket.js
+++ b/opendc-web/opendc-web-ui/src/api/socket.js
@@ -7,7 +7,7 @@ const callbacks = {}
 
 export function setupSocketConnection(onConnect) {
     const apiUrl =
-        process.env.REACT_APP_API_BASE_URL ||
+        window.$$env['API_BASE_URL'] ||
         `${window.location.protocol}//${window.location.hostname}:${window.location.port}`
 
     socket = io.connect(apiUrl)
diff --git a/opendc-web/opendc-web-ui/src/containers/auth/Login.js b/opendc-web/opendc-web-ui/src/containers/auth/Login.js
index 2f9726bf..9201c09a 100644
--- a/opendc-web/opendc-web-ui/src/containers/auth/Login.js
+++ b/opendc-web/opendc-web-ui/src/containers/auth/Login.js
@@ -32,15 +32,15 @@ class LoginContainer extends React.Component {
 
         return (
             <GoogleLogin
-                clientId={process.env.REACT_APP_OAUTH_CLIENT_ID}
+                clientId={window.$$env['OAUTH_CLIENT_ID']}
                 onSuccess={this.onAuthResponse.bind(this)}
                 onFailure={this.onAuthFailure.bind(this)}
                 render={(renderProps) => (
                     <span onClick={renderProps.onClick} className="login btn btn-primary">
-                        <span className="fa fa-google" /> Login with Google
+                        <span className="fa fa-google"/> Login with Google
                     </span>
                 )}
-            ></GoogleLogin>
+            />
         )
     }
 }
diff --git a/opendc-web/opendc-web-ui/src/index.js b/opendc-web/opendc-web-ui/src/index.js
index 3517147e..bddf0b0e 100644
--- a/opendc-web/opendc-web-ui/src/index.js
+++ b/opendc-web/opendc-web-ui/src/index.js
@@ -12,10 +12,11 @@ setupSocketConnection(() => {
     const store = configureStore()
 
     // Initialize Sentry if the user has configured a DSN
-    if (process.env.REACT_APP_SENTRY_DSN) {
+    const dsn = window.$$env['SENTRY_DSN']
+    if (dsn) {
         Sentry.init({
             environment: process.env.NODE_ENV,
-            dsn: process.env.REACT_APP_SENTRY_DSN,
+            dsn: dsn,
             integrations: [new Integrations.BrowserTracing()],
             tracesSampleRate: 0.1,
         })
-- 
cgit v1.2.3


From d22a757a86107ee35a64e1eb23282770cdd901dd Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 5 May 2021 20:50:18 +0200
Subject: build: Use type-safe project accessors

This change updates the build scripts to use type-safe project accessors
when specifying build dependencies between modules.
---
 opendc-web/opendc-web-runner/build.gradle.kts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'opendc-web')

diff --git a/opendc-web/opendc-web-runner/build.gradle.kts b/opendc-web/opendc-web-runner/build.gradle.kts
index fcc78a83..2981ddc7 100644
--- a/opendc-web/opendc-web-runner/build.gradle.kts
+++ b/opendc-web/opendc-web-runner/build.gradle.kts
@@ -33,12 +33,12 @@ application {
 }
 
 dependencies {
-    api(platform(project(":opendc-platform")))
-    implementation(project(":opendc-compute:opendc-compute-simulator"))
-    implementation(project(":opendc-format"))
-    implementation(project(":opendc-experiments:opendc-experiments-capelin"))
-    implementation(project(":opendc-simulator:opendc-simulator-core"))
-    implementation(project(":opendc-simulator:opendc-simulator-compute"))
+    api(platform(projects.opendcPlatform))
+    implementation(projects.opendcCompute.opendcComputeSimulator)
+    implementation(projects.opendcFormat)
+    implementation(projects.opendcExperiments.opendcExperimentsCapelin)
+    implementation(projects.opendcSimulator.opendcSimulatorCore)
+    implementation(projects.opendcTelemetry.opendcTelemetrySdk)
 
     implementation("io.github.microutils:kotlin-logging")
     implementation("com.github.ajalt.clikt:clikt:${versions["clikt"]}")
@@ -48,6 +48,4 @@ dependencies {
 
     runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}")
     runtimeOnly("org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}")
-
-    implementation(project(":opendc-telemetry:opendc-telemetry-sdk"))
 }
-- 
cgit v1.2.3


From c244d7e42a88105fbec5356030ed266f1af0811e Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 5 May 2021 22:32:28 +0200
Subject: build: Prevent publishing application modules

This change updates the Gradle build configuration so that the
application modules (as opposed the libraries) are not published onto
Maven Central.
---
 opendc-web/opendc-web-runner/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'opendc-web')

diff --git a/opendc-web/opendc-web-runner/build.gradle.kts b/opendc-web/opendc-web-runner/build.gradle.kts
index 2981ddc7..60a24b92 100644
--- a/opendc-web/opendc-web-runner/build.gradle.kts
+++ b/opendc-web/opendc-web-runner/build.gradle.kts
@@ -24,7 +24,7 @@ description = "Experiment runner for OpenDC"
 
 /* Build configuration */
 plugins {
-    `kotlin-library-conventions`
+    `kotlin-conventions`
     application
 }
 
-- 
cgit v1.2.3