Merge branch 'ust_24475/api_account_ui_needs_to_provide_a_configurati…

…on_for_tenants_pr' into branches/rudder/8.1
Normation · Mar 19, 2024 · 25666ee · 25666ee
2 parents 1c83c9c + 9005f94
commit 25666ee
Show file tree

Hide file tree

Showing 15 changed files with 1,128 additions and 630 deletions.
diff --git a/...p/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/ApiAccountDiff.scala b/...p/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/ApiAccountDiff.scala
@@ -59,5 +59,6 @@ final case class ModifyApiAccountDiff(
     modExpirationDate:      Option[SimpleDiff[Option[DateTime]]] = None,
     modAPIKind:             Option[SimpleDiff[String]] = None,
     modAccountKind:         Option[SimpleDiff[String]] = None,
-    modAccountAcl:          Option[SimpleDiff[List[ApiAclElement]]] = None
+    modAccountAcl:          Option[SimpleDiff[List[ApiAclElement]]] = None,
+    modAPITenants:          Option[SimpleDiff[String]] = None
 ) extends ApiAccountDiff
diff --git a/...s/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/RestDataSerializer.scala b/...s/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/RestDataSerializer.scala
@@ -683,7 +683,8 @@ object ApiAccountSerialisation {
             (expirationDate.map(DateFormaterService.getDisplayDateTimePicker), Some(authz.kind.name), acl)
         }
       }
-      ("id" -> account.id.value) ~
+
+      ("id"                    -> account.id.value) ~
       ("name"                  -> account.name.value) ~
       ("token"                 -> account.token.value) ~
       ("tokenGenerationDate"   -> DateFormaterService.serialize(account.tokenGenerationDate)) ~
@@ -694,7 +695,8 @@ object ApiAccountSerialisation {
       ("expirationDate"        -> expirationDate) ~
       ("expirationDateDefined" -> expirationDate.isDefined) ~
       ("authorizationType"     -> authzType) ~
-      ("acl"                   -> acl.map(x => Extraction.decompose(x)))
+      ("acl"                   -> acl.map(x => Extraction.decompose(x))) ~
+      ("tenants"               -> account.tenants.serialize)
     }
   }
 }
diff --git a/...dder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDiffMapper.scala b/...dder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDiffMapper.scala
@@ -653,6 +653,10 @@ class LDAPDiffMapper(
                                 } yield {
                                   d.copy(modAccountAcl = Some(SimpleDiff(oldAcl, acl)))
                                 }
+                              case A_API_TENANT                  =>
+                                diff.map(
+                                  _.copy(modAPITenants = Some(SimpleDiff(oldAccount.tenants.serialize, mod.getOptValueDefault("-"))))
+                                )
 
                               case x => Left(Err.UnexpectedObject("Unknown diff attribute: " + x))
                             }

diff --git a/...er/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPEntityMapper.scala b/...er/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPEntityMapper.scala
@@ -1144,6 +1144,7 @@ class LDAPEntityMapper(
     mod.resetValuesTo(A_DESCRIPTION, principal.description)
     mod.resetValuesTo(A_IS_ENABLED, principal.isEnabled.toLDAPString)
     mod.resetValuesTo(A_API_KIND, principal.kind.kind.name)
+    mod.resetValuesTo(A_API_TENANT, principal.tenants.serialize)
 
     principal.kind match {
       case ApiAccountKind.PublicApi(authz, exp) =>

diff --git a/...es/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestExtractorService.scala b/...es/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestExtractorService.scala
@@ -1059,8 +1059,7 @@ final case class RestExtractorService(
       expirationValue   <- extractJsonString(json, "expirationDate", DateFormaterService.parseDateTimePicker(_).toBox)
       authType          <- extractJsonString(json, "authorizationType", ApiAuthorizationKind.parse)
       tenants           <- extractJsonString(json, "tenants", s => NodeSecurityContext.parse(Some(s)).toBox)
-
-      acl <- extractJsonArray(json, "acl")((extractApiACLFromJSON _)).map(_.getOrElse(Nil))
+      acl               <- extractJsonArray(json, "acl")((extractApiACLFromJSON _)).map(_.getOrElse(Nil))
     } yield {
 
       val auth       = authType match {

diff --git a/...udder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RestApiAccounts.scala b/...udder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RestApiAccounts.scala
@@ -302,15 +302,16 @@ final case class RestApiAccount(
 
   // Id cannot change if already defined
   def update(account: ApiAccount): ApiAccount = {
-    val nameUpdate   = name.getOrElse(account.name)
-    val enableUpdate = enabled.getOrElse(account.isEnabled)
-    val descUpdate   = description.getOrElse(account.description)
-    val kind         = account.kind match {
+    val nameUpdate    = name.getOrElse(account.name)
+    val enableUpdate  = enabled.getOrElse(account.isEnabled)
+    val descUpdate    = description.getOrElse(account.description)
+    val tenantsUpdate = tenants.getOrElse(account.tenants)
+    val kind          = account.kind match {
       case ApiAccountKind.PublicApi(a, e) =>
         ApiAccountKind.PublicApi(authz.getOrElse(a), expiration.getOrElse(e))
       case x                              => x
     }
 
-    account.copy(name = nameUpdate, isEnabled = enableUpdate, description = descUpdate, kind = kind)
+    account.copy(name = nameUpdate, isEnabled = enableUpdate, description = descUpdate, kind = kind, tenants = tenantsUpdate)
   }
 }
diff --git a/...dder/rudder-rest/src/test/scala/com/normation/rudder/rest/TraitTestApiFromYamlFiles.scala b/...dder/rudder-rest/src/test/scala/com/normation/rudder/rest/TraitTestApiFromYamlFiles.scala
@@ -181,15 +181,18 @@ trait TraitTestApiFromYamlFiles extends Specification with BoxSpecMatcher with J
     // file are copier directly into destDir
     def copyTransform(orig: Path, destDir: File): IOResult[(String, IOManaged[InputStream])] = {
       // for now, nothing more
-      val name = orig.getFileName.toString
-      val dest = destDir / name
-      for {
-        f <- IOResult
-               .attempt(Resource.asString(orig.toString).map(s => dest.write(transform(name, s))))
-               .notOptional(s"Missing source file: ${orig}")
-      } yield {
-        (name, ZIO.acquireRelease(IOResult.attempt(f.newInputStream))(is => effectUioUnit(is.close())))
-      }
+      val name         = orig.getFileName.toString
+      val dest         = destDir / name
+      val emptyManaged = IOManaged.make("".inputStream)(is => effectUioUnit(is.close()))
+
+      IOResult
+        .attempt(Resource.asString(orig.toString).map(s => dest.write(transform(name, s))))
+        .option
+        .flatMap {
+          case Some(Some(f)) =>
+            (name, ZIO.acquireRelease(IOResult.attempt(f.newInputStream))(is => effectUioUnit(is.close()))).succeed
+          case _             => effectUioUnit(println(s"Ignoring missing file: ${orig}")) *> (name, emptyManaged).succeed
+        }
     }
 
     // the list anyref here is Yaml objects