chore: split spring profiles into dedicated files as required by Spring Boot 3

SteKoe · SteKoe · commit 7b9e0b8e5753 · 2022-09-17T12:57:35.000+02:00
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/resources/application-dev.yml b/spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/resources/application-dev.yml
@@ -0,0 +1,9 @@
+spring:
+  boot:
+    admin:
+      ui:
+        cache:
+          no-cache: true
+        template-location: file:../../spring-boot-admin-server-ui/target/dist/
+        resource-locations: file:../../spring-boot-admin-server-ui/target/dist/
+        cache-templates: false
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/resources/application-insecure.yml b/spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/resources/application-insecure.yml
@@ -0,0 +1 @@
+info.tags.security: insecure
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/resources/application-secure.yml b/spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/resources/application-secure.yml
@@ -0,0 +1,5 @@
+spring:
+  security:
+    user:
+      name: "user"
+      password: "password"
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/resources/application.yml b/spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/resources/application.yml
@@ -33,19 +33,3 @@ management:
   endpoint:
     health:
       show-details: ALWAYS
-
----
-spring:
-  config:
-    activate:
-      on-profile: insecure
----
-spring:
-  security:
-    user:
-      name: "user"
-      password: "password"
-  config:
-    activate:
-      on-profile: secure
-
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-eureka/src/main/resources/application-dev.yml b/spring-boot-admin-samples/spring-boot-admin-sample-eureka/src/main/resources/application-dev.yml
@@ -0,0 +1,9 @@
+spring:
+  boot:
+    admin:
+      ui:
+        cache:
+          no-cache: true
+        template-location: file:../../spring-boot-admin-server-ui/target/dist/
+        resource-locations: file:../../spring-boot-admin-server-ui/target/dist/
+        cache-templates: false
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-eureka/src/main/resources/application-insecure.yml b/spring-boot-admin-samples/spring-boot-admin-sample-eureka/src/main/resources/application-insecure.yml
@@ -0,0 +1 @@
+info.tags.security: insecure
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-eureka/src/main/resources/application-secure.yml b/spring-boot-admin-samples/spring-boot-admin-sample-eureka/src/main/resources/application-secure.yml
@@ -0,0 +1,14 @@
+spring:
+  security:
+    user:
+      name: "user"
+      password: "password"
+  boot:
+    admin:
+      client:
+        username: "user"       #These two are needed so that the client
+        password: "password"   #can register at the protected server api
+        instance:
+          metadata:
+            user.name: "user"         #These two are needed so that the server
+            user.password: "password" #can access the protected client endpoints
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-eureka/src/main/resources/application.yml b/spring-boot-admin-samples/spring-boot-admin-sample-eureka/src/main/resources/application.yml
@@ -27,23 +27,3 @@ management:
     health:
       show-details: ALWAYS
 # end::configuration-eureka[]
-
----
-spring:
-  config:
-    activate:
-      on-profile: insecure
----
-spring:
-  security:
-    user:
-      name: "user"
-      password: "password"
-  config:
-    activate:
-      on-profile: secure
-eureka:
-  instance:
-    metadata-map:
-      user.name: "user"         #These two are needed so that the server
-      user.password: "password" #can access the protected client endpoints
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/main/resources/application-dev.yml b/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/main/resources/application-dev.yml
@@ -0,0 +1,9 @@
+spring:
+  boot:
+    admin:
+      ui:
+        cache:
+          no-cache: true
+        template-location: file:../../spring-boot-admin-server-ui/target/dist/
+        resource-locations: file:../../spring-boot-admin-server-ui/target/dist/
+        cache-templates: false
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/main/resources/application-insecure.yml b/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/main/resources/application-insecure.yml
@@ -0,0 +1 @@
+info.tags.security: insecure
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/main/resources/application-secure.yml b/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/main/resources/application-secure.yml
@@ -0,0 +1,14 @@
+spring:
+  security:
+    user:
+      name: "user"
+      password: "password"
+  boot:
+    admin:
+      client:
+        username: "user"       #These two are needed so that the client
+        password: "password"   #can register at the protected server api
+        instance:
+          metadata:
+            user.name: "user"         #These two are needed so that the server
+            user.password: "password" #can access the protected client endpoints
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/main/resources/application.yml b/spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/main/resources/application.yml
@@ -22,29 +22,3 @@ spring:
   profiles:
     active:
       - insecure
-
----
-spring:
-  config:
-    activate:
-      on-profile: insecure
----
-spring:
-  security:
-    user:
-      name: "user"
-      password: "password"
-  boot:
-    admin:
-      client:
-        username: "user"       #These two are needed so that the client
-        password: "password"   #can register at the protected server api
-        instance:
-          metadata:
-            user.name: "user"         #These two are needed so that the server
-            user.password: "password" #can access the protected client endpoints
-  config:
-    activate:
-      on-profile: secure
-
-
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/main/resources/application-dev.yml b/spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/main/resources/application-dev.yml
@@ -0,0 +1,9 @@
+spring:
+  boot:
+    admin:
+      ui:
+        cache:
+          no-cache: true
+        template-location: file:../../spring-boot-admin-server-ui/target/dist/
+        resource-locations: file:../../spring-boot-admin-server-ui/target/dist/
+        cache-templates: false
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/main/resources/application-insecure.yml b/spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/main/resources/application-insecure.yml
@@ -0,0 +1 @@
+info.tags.security: insecure
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/main/resources/application-secure.yml b/spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/main/resources/application-secure.yml
@@ -0,0 +1,14 @@
+spring:
+  security:
+    user:
+      name: "user"
+      password: "password"
+  boot:
+    admin:
+      client:
+        username: "user"       #These two are needed so that the client
+        password: "password"   #can register at the protected server api
+        instance:
+          metadata:
+            user.name: "user"         #These two are needed so that the server
+            user.password: "password" #can access the protected client endpoints
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/main/resources/application.yml b/spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/main/resources/application.yml
@@ -1,4 +1,3 @@
----
 info:
   scm-url: "@scm.url@"
   build-url: "https://travis-ci.org/codecentric/spring-boot-admin"
@@ -26,47 +25,3 @@ spring:
   profiles:
     active:
       - insecure
-
----
-spring:
-  config:
-    activate:
-      on-profile: dev
-  boot:
-    admin:
-      ui:
-        cache:
-          no-cache: true
-        template-location: file:../../spring-boot-admin-server-ui/target/dist/
-        resource-locations: file:../../spring-boot-admin-server-ui/target/dist/
-        cache-templates: false
-
----
-spring:
-  config:
-    activate:
-      on-profile: insecure
----
-spring:
-  security:
-    user:
-      name: "user"
-      password: "password"
-  boot:
-    admin:
-      client:
-        username: "user"       #These two are needed so that the client
-        password: "password"   #can register at the protected server api
-        instance:
-          metadata:
-            user.name: "user"         #These two are needed so that the server
-            user.password: "password" #can access the protected client endpoints
-  config:
-    activate:
-      on-profile: secure
-
----
-spring:
-  profiles: basepath
-  webflux:
-    base-path: /sba
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-war/src/main/resources/application-dev.yml b/spring-boot-admin-samples/spring-boot-admin-sample-war/src/main/resources/application-dev.yml
@@ -0,0 +1,9 @@
+spring:
+  boot:
+    admin:
+      ui:
+        cache:
+          no-cache: true
+        template-location: file:../../spring-boot-admin-server-ui/target/dist/
+        resource-locations: file:../../spring-boot-admin-server-ui/target/dist/
+        cache-templates: false
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-war/src/main/resources/application-insecure.yml b/spring-boot-admin-samples/spring-boot-admin-sample-war/src/main/resources/application-insecure.yml
@@ -0,0 +1 @@
+info.tags.security: insecure
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-war/src/main/resources/application-secure.yml b/spring-boot-admin-samples/spring-boot-admin-sample-war/src/main/resources/application-secure.yml
@@ -0,0 +1,14 @@
+spring:
+  security:
+    user:
+      name: "user"
+      password: "password"
+  boot:
+    admin:
+      client:
+        username: "user"       #These two are needed so that the client
+        password: "password"   #can register at the protected server api
+        instance:
+          metadata:
+            user.name: "user"         #These two are needed so that the server
+            user.password: "password" #can access the protected client endpoints
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-war/src/main/resources/application.yml b/spring-boot-admin-samples/spring-boot-admin-sample-war/src/main/resources/application.yml
@@ -19,29 +19,3 @@ management:
   endpoint:
     health:
       show-details: ALWAYS
-
----
-spring:
-  config:
-    activate:
-      on-profile: insecure
----
-spring:
-  security:
-    user:
-      name: "user"
-      password: "password"
-  boot:
-    admin:
-      client:
-        username: "user"       #These two are needed so that the client
-        password: "password"   #can register at the protected server api
-        instance:
-          metadata:
-            user.name: "user"         #These two are needed so that the server
-            user.password: "password" #can access the protected client endpoints
-  config:
-    activate:
-      on-profile: secure
-
-
diff --git a/spring-boot-admin-server-ui/src/main/frontend/components/sba-tag.stories.js b/spring-boot-admin-server-ui/src/main/frontend/components/sba-tag.stories.js
@@ -0,0 +1,34 @@
+import SbaTag from './sba-tag.vue';
+
+export default {
+  component: SbaTag,
+  title: 'Components/Tag',
+  argTypes: {
+    value: {
+      description: 'A value to show',
+      example: "asd",
+      control: 'text'
+    },
+    label: {
+      description: 'An optional label',
+      example: "asd",
+      control: 'text'
+    },
+    small: {
+      description: 'A single value to show',
+      control: 'boolean'
+    }
+  }
+};
+
+const Template = (args) => ({
+  components: {SbaTag},
+  setup() { return { args }; },
+
+  template: '<sba-tag v-bind="args" />'
+});
+
+export const Tag = Template.bind({});
+Tag.args = {
+  value: 'I am a tag',
+};
