fix: fix id and namespace error

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/amphitheatre-app/amphitheatre"
@@ -21,7 +21,7 @@ members = [
 # https://doc.rust-lang.org/cargo/reference/workspaces.html#the-workspacedependencies-table
 [workspace.dependencies]
 anyhow = "1.0"
-amp-common = { git = "https://github.com/amphitheatre-app/common", tag = "v0.7.0" }
+amp-common = { git = "https://github.com/amphitheatre-app/common", tag = "v0.7.1" }
 amp-resolver = { path = "resolver" }
 amp-resources = { path = "resources" }
 async-nats = "0.33.0"

apiserver/src/services/playbook.rs

@@ -58,9 +58,9 @@ impl PlaybookService {
         let resource = Playbook::new(
             &uuid.to_string(),
             PlaybookSpec {
+                id: uuid.to_string(),
                 title: req.title.to_string(),
                 description: req.description.clone(),
-                namespace: format!("amp-{}", uuid),
                 preface: req.preface.clone(),
                 ..PlaybookSpec::default()
             },

controllers/src/playbook_controller.rs

@@ -195,6 +195,6 @@ pub async fn cleanup(playbook: &Playbook, ctx: &Arc<Context>, _recorder: &Record
 #[inline]
 fn reference(playbook: &Playbook) -> ObjectReference {
     let mut reference = playbook.object_ref(&());
-    reference.namespace = Some(playbook.spec.namespace.to_string());
+    reference.namespace = Some(playbook.spec.namespace());
     reference
 }

resources/src/actor.rs

@@ -23,14 +23,14 @@ use serde_json::json;
 use tracing::{debug, error, info};
 
 pub async fn exists(client: &Client, playbook: &Playbook, name: &str) -> Result<bool> {
-    let namespace = playbook.spec.namespace.clone();
+    let namespace = playbook.spec.namespace();
     let api: Api<Actor> = Api::namespaced(client.clone(), namespace.as_str());
 
     Ok(api.get_opt(name).await.map_err(Error::KubeError)?.is_some())
 }
 
 pub async fn create(client: &Client, playbook: &Playbook, spec: &ActorSpec) -> Result<Actor> {
-    let namespace = playbook.spec.namespace.clone();
+    let namespace = playbook.spec.namespace();
     let api: Api<Actor> = Api::namespaced(client.clone(), namespace.as_str());
 
     let name = spec.name.clone();
@@ -48,7 +48,7 @@ pub async fn create(client: &Client, playbook: &Playbook, spec: &ActorSpec) -> R
 }
 
 pub async fn update(client: &Client, playbook: &Playbook, spec: &ActorSpec) -> Result<Actor> {
-    let namespace = playbook.spec.namespace.clone();
+    let namespace = playbook.spec.namespace();
     let api: Api<Actor> = Api::namespaced(client.clone(), namespace.as_str());
 
     let name = spec.name.clone();

resources/src/namespace.rs

@@ -25,7 +25,7 @@ use super::error::{Error, Result};
 
 pub async fn create(client: &Client, playbook: &Playbook) -> Result<Namespace> {
     let api: Api<Namespace> = Api::all(client.clone());
-    let name = playbook.spec.namespace.clone();
+    let name = playbook.spec.namespace();
 
     let resource = new(playbook);
     debug!("The namespace resource:\n {:?}\n", resource);
@@ -38,7 +38,7 @@ pub async fn create(client: &Client, playbook: &Playbook) -> Result<Namespace> {
 }
 
 fn new(playbook: &Playbook) -> Namespace {
-    let name = playbook.spec.namespace.clone();
+    let name = playbook.spec.namespace();
     let owner_reference = playbook.controller_owner_ref(&()).unwrap();
     let labels = BTreeMap::from([
         ("app.kubernetes.io/managed-by".into(), "Amphitheatre".into()),