Merge pull request #72 from CleverCloud/devel/fdubois/refactor/naming

Update naming of addons create by the operator by appending the custom resource name

Author: FlorentinDUBOIS

src/svc/clevercloud/ext.rs

@@ -30,7 +30,12 @@ pub trait AddonExt: Into<CreateOpts> + Clone + Debug + Sync + Send {
 
     #[cfg_attr(feature = "trace", tracing::instrument)]
     fn prefix() -> String {
-        "kubernetes::".to_string()
+        "kubernetes".to_string()
+    }
+
+    #[cfg_attr(feature = "trace", tracing::instrument)]
+    fn delimiter() -> String {
+        "::".to_string()
     }
 
     #[cfg_attr(feature = "trace", tracing::instrument)]

src/svc/crd/config_provider.rs

@@ -106,7 +106,12 @@ impl AddonExt for ConfigProvider {
 
     #[cfg_attr(feature = "trace", tracing::instrument)]
     fn name(&self) -> String {
+        let delimiter = Self::delimiter();
+
         Self::prefix()
+            + &delimiter
+            + &Self::kind(&()).to_string()
+            + &delimiter
             + &self
                 .uid()
                 .expect("expect all resources in kubernetes to have an identifier")

src/svc/crd/elasticsearch.rs

@@ -146,7 +146,12 @@ impl AddonExt for ElasticSearch {
 
     #[cfg_attr(feature = "trace", tracing::instrument)]
     fn name(&self) -> String {
+        let delimiter = Self::delimiter();
+
         Self::prefix()
+            + &delimiter
+            + &Self::kind(&()).to_string()
+            + &delimiter
             + &self
                 .uid()
                 .expect("expect all resources in kubernetes to have an identifier")

src/svc/crd/mongodb.rs

@@ -130,7 +130,12 @@ impl AddonExt for MongoDb {
 
     #[cfg_attr(feature = "trace", tracing::instrument)]
     fn name(&self) -> String {
+        let delimiter = Self::delimiter();
+
         Self::prefix()
+            + &delimiter
+            + &Self::kind(&()).to_string()
+            + &delimiter
             + &self
                 .uid()
                 .expect("expect all resources in kubernetes to have an identifier")

src/svc/crd/mysql.rs

@@ -130,7 +130,12 @@ impl AddonExt for MySql {
 
     #[cfg_attr(feature = "trace", tracing::instrument)]
     fn name(&self) -> String {
+        let delimiter = Self::delimiter();
+
         Self::prefix()
+            + &delimiter
+            + &Self::kind(&()).to_string()
+            + &delimiter
             + &self
                 .uid()
                 .expect("expect all resources in kubernetes to have an identifier")

src/svc/crd/postgresql.rs

@@ -130,7 +130,12 @@ impl AddonExt for PostgreSql {
 
     #[cfg_attr(feature = "trace", tracing::instrument)]
     fn name(&self) -> String {
+        let delimiter = Self::delimiter();
+
         Self::prefix()
+            + &delimiter
+            + &Self::kind(&()).to_string()
+            + &delimiter
             + &self
                 .uid()
                 .expect("expect all resources in kubernetes to have an identifier")

src/svc/crd/pulsar.rs

@@ -113,7 +113,12 @@ impl AddonExt for Pulsar {
 
     #[cfg_attr(feature = "trace", tracing::instrument)]
     fn name(&self) -> String {
+        let delimiter = Self::delimiter();
+
         Self::prefix()
+            + &delimiter
+            + &Self::kind(&()).to_string()
+            + &delimiter
             + &self
                 .uid()
                 .expect("expect all resources in kubernetes to have an identifier")

src/svc/crd/redis.rs

@@ -130,7 +130,12 @@ impl AddonExt for Redis {
 
     #[cfg_attr(feature = "trace", tracing::instrument)]
     fn name(&self) -> String {
+        let delimiter = Self::delimiter();
+
         Self::prefix()
+            + &delimiter
+            + &Self::kind(&()).to_string()
+            + &delimiter
             + &self
                 .uid()
                 .expect("expect all resources in kubernetes to have an identifier")