wip: versioning

Author: adwk67

crates/stackable-operator/src/crd/git_sync/mod.rs

@@ -7,15 +7,19 @@ use serde::{Deserialize, Serialize};
 use stackable_shared::time::Duration;
 use url::Url;
 
-use crate::versioned::versioned;
+use crate::{crd::git_sync::v1alpha2::Credentials, versioned::versioned};
 
 mod v1alpha1_impl;
+mod v1alpha2_impl;
 
-#[versioned(version(name = "v1alpha1"))]
+#[versioned(version(name = "v1alpha1"), version(name = "v1alpha2"))]
 pub mod versioned {
     pub mod v1alpha1 {
         pub use v1alpha1_impl::{Error, GitSyncResources};
     }
+    pub mod v1alpha2 {
+        pub use v1alpha2_impl::{Error, GitSyncResources};
+    }
 
     #[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Eq, Serialize)]
     #[serde(rename_all = "camelCase")]
@@ -26,24 +30,24 @@ pub mod versioned {
         /// The branch to clone; defaults to `main`.
         ///
         /// Since git-sync v4.x.x this field is mapped to the flag `--ref`.
-        #[serde(default = "GitSync::default_branch")]
+        #[serde(default = "v1alpha2::GitSync::default_branch")]
         pub branch: String,
 
         /// Location in the Git repository containing the resource; defaults to the root folder.
         ///
         /// It can optionally start with `/`, however, no trailing slash is recommended.
         /// An empty string (``) or slash (`/`) corresponds to the root folder in Git.
-        #[serde(default = "GitSync::default_git_folder")]
+        #[serde(default = "v1alpha2::GitSync::default_git_folder")]
         pub git_folder: PathBuf,
 
         /// The depth of syncing, i.e. the number of commits to clone; defaults to 1.
-        #[serde(default = "GitSync::default_depth")]
+        #[serde(default = "v1alpha2::GitSync::default_depth")]
         pub depth: u32,
 
         /// The synchronization interval, e.g. `20s` or `5m`; defaults to `20s`.
         ///
         /// Since git-sync v4.x.x this field is mapped to the flag `--period`.
-        #[serde(default = "GitSync::default_wait")]
+        #[serde(default = "v1alpha2::GitSync::default_wait")]
         pub wait: Duration,
 
         /// A map of optional configuration settings that are listed in the git-sync [documentation].
@@ -56,6 +60,13 @@ pub mod versioned {
         pub git_sync_conf: BTreeMap<String, String>,
 
         /// An optional secret used for git access.
+        #[versioned(changed(
+            since = "v1alpha2",
+            from_name = "credentials_secret",
+            from_type = "Option<String>",
+            upgrade_with = credentials_secret_to_basic_auth,
+            downgrade_with = credentials_to_secret
+        ))]
         pub credentials: Option<Credentials>,
     }
 
@@ -79,3 +90,15 @@ pub mod versioned {
         SshPrivateKeySecretName(String),
     }
 }
+
+pub fn credentials_to_secret(input: Option<Credentials>) -> Option<String> {
+    if let Some(Credentials::BasicAuthSecretName(credentials_secret)) = input {
+        Some(credentials_secret)
+    } else {
+        None
+    }
+}
+
+pub fn credentials_secret_to_basic_auth(input: Option<String>) -> Option<Credentials> {
+    input.map(Credentials::BasicAuthSecretName)
+}