Merge branch 'main' into CIEDEV-2141

terrariumcloud · Nov 14, 2023 · 0c682f2 · 0c682f2
2 parents a4e0877 + 60fca4d
commit 0c682f2
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 37 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -75,28 +75,28 @@ func newTraceExporter(ctx context.Context) (*otlptrace.Exporter, error) {
 }
 
 func newServiceResource(name string) *resource.Resource {
-	res, err := resource.Merge(
-		resource.Default(),
-		resource.NewWithAttributes(semconv.SchemaURL, semconv.ServiceNameKey.String(name)),
-	)
-	if err != nil {
-		log.Fatalf("The SchemaURL of the resources is not merged.")
-	}
-	versionInfo := buildVersion
-	if serviceVersion, found := os.LookupEnv("OTEL_SERVICE_VERSION"); found {
-		log.Println("Warning: build time version overriden by environment variable")
-		versionInfo = serviceVersion
-
-	}
-	res, err = resource.Merge(
-		res,
-		resource.NewWithAttributes(semconv.SchemaURL, semconv.ServiceVersionKey.String(versionInfo)),
-	)
-	if err != nil {
-		log.Fatalf("The SchemaURL of the resources is not merged.")
-	}
-
-	return res
+    res, err := resource.Merge(
+        resource.Default(),
+        resource.NewWithAttributes(semconv.SchemaURL, semconv.ServiceNameKey.String(name)),
+    )
+    if err != nil {
+        log.Fatalf("The SchemaURL of the resources is not merged.")
+    }
+    versionInfo := buildVersion
+    if serviceVersion, found := os.LookupEnv("OTEL_SERVICE_VERSION"); found {
+        log.Println("Warning: build time version overriden by environment variable")
+        versionInfo = serviceVersion
+
+    }
+    res, err = resource.Merge(
+        res,
+        resource.NewWithAttributes(semconv.SchemaURL, semconv.ServiceVersionKey.String(versionInfo)),
+    )
+    if err != nil {
+        log.Fatalf("The SchemaURL of the resources is not merged.")
+    }
+
+    return res
 }
 
 func startGRPCService(name string, service services.Service) {

diff --git a/internal/restapi/browse/frontend/build/asset-manifest.json b/internal/restapi/browse/frontend/build/asset-manifest.json
@@ -1,19 +1,19 @@
 {
   "files": {
     "main.css": "/static/css/main.e6c13ad2.css",
-    "main.js": "/static/js/main.dc06e25d.js",
-    "static/js/787.3f635e35.chunk.js": "/static/js/787.3f635e35.chunk.js",
+    "main.js": "/static/js/main.87b33658.js",
+    "static/js/496.c4cdc242.chunk.js": "/static/js/496.c4cdc242.chunk.js",
     "static/media/providers.jpg": "/static/media/providers.d93903ad43e82698abfc.jpg",
     "static/media/not-found-1.jpg": "/static/media/not-found-1.3eec1753dacc2df2dcac.jpg",
     "static/media/server-error-1.jpg": "/static/media/server-error-1.6a4af50aed762b81d561.jpg",
     "static/media/modules.png": "/static/media/modules.df4734ecc28bffc1b755.png",
     "index.html": "/index.html",
     "main.e6c13ad2.css.map": "/static/css/main.e6c13ad2.css.map",
-    "main.dc06e25d.js.map": "/static/js/main.dc06e25d.js.map",
-    "787.3f635e35.chunk.js.map": "/static/js/787.3f635e35.chunk.js.map"
+    "main.87b33658.js.map": "/static/js/main.87b33658.js.map",
+    "496.c4cdc242.chunk.js.map": "/static/js/496.c4cdc242.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.e6c13ad2.css",
-    "static/js/main.dc06e25d.js"
+    "static/js/main.87b33658.js"
   ]
 }
diff --git a/internal/restapi/browse/frontend/build/index.html b/internal/restapi/browse/frontend/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Terrarium: Synamedia Terraform Registry</title><script defer="defer" src="/static/js/main.dc06e25d.js"></script><link href="/static/css/main.e6c13ad2.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Terrarium: Synamedia Terraform Registry</title><script defer="defer" src="/static/js/main.87b33658.js"></script><link href="/static/css/main.e6c13ad2.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/internal/restapi/browse/frontend/build/static/css/main.e6c13ad2.css.map b/internal/restapi/browse/frontend/build/static/css/main.e6c13ad2.css.map
diff --git a/internal/restapi/browse/frontend/build/static/js/496.c4cdc242.chunk.js b/internal/restapi/browse/frontend/build/static/js/496.c4cdc242.chunk.js
diff --git a/internal/restapi/browse/frontend/build/static/js/496.c4cdc242.chunk.js.map b/internal/restapi/browse/frontend/build/static/js/496.c4cdc242.chunk.js.map
diff --git a/internal/restapi/browse/frontend/build/static/js/787.3f635e35.chunk.js b/internal/restapi/browse/frontend/build/static/js/787.3f635e35.chunk.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Terrarium: Synamedia Terraform Registry</title><script defer="defer" src="/static/js/main.dc06e25d.js"></script><link href="/static/css/main.e6c13ad2.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Terrarium: Synamedia Terraform Registry</title><script defer="defer" src="/static/js/main.87b33658.js"></script><link href="/static/css/main.e6c13ad2.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>