fix(cli): fix seeder to handle empty data (#42)

* fix(cli): fix seeder to handle empty data (#41) fix(cli): fix seeder to handle empty values * chore(cli): cleanup * fix(cli): azure pipeline
ogcio · Jun 26, 2024 · 9b91d9f · 9b91d9f
1 parent ce792ab
commit 9b91d9f
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 28 deletions.
diff --git a/azure_pipelines.yml b/azure_pipelines.yml
@@ -75,6 +75,10 @@ stages:
         awsServiceConnection: ${{ variables.awsServiceConnection }}
         awsRegion: ${{ variables.awsRegion }}
         serviceName: logto
+  - stage: Deploy_Logto_Admin
+    displayName: Deploy to ECS - logto Admin
+    dependsOn: Push_Logto
+    jobs:
     - template: pipeline-templates/deploy_ecs.yml
       parameters:
         awsServiceConnection: ${{ variables.awsServiceConnection }}

diff --git a/packages/cli/src/commands/database/ogcio/ogcio-seeder.ts b/packages/cli/src/commands/database/ogcio/ogcio-seeder.ts
@@ -4,16 +4,16 @@
 export type OgcioTenantSeeder = Record<string, OgcioSeeder>;
 
 export type OgcioSeeder = {
-  organizations: OrganizationSeeder[];
-  organization_permissions: OrganizationPermissionSeeder[];
-  organization_roles: OrganizationRoleSeeder[];
-  applications: ApplicationSeeder[];
-  resources: ResourceSeeder[];
-  connectors: ConnectorSeeder[];
-  webhooks: WebhookSeeder[];
-  sign_in_experiences: SignInExperienceSeeder[];
-  resource_permissions: ResourcePermissionSeeder[];
-  resource_roles: ResourceRoleSeeder[];
+  organizations?: OrganizationSeeder[];
+  organization_permissions?: OrganizationPermissionSeeder[];
+  organization_roles?: OrganizationRoleSeeder[];
+  applications?: ApplicationSeeder[];
+  resources?: ResourceSeeder[];
+  connectors?: ConnectorSeeder[];
+  webhooks?: WebhookSeeder[];
+  sign_in_experiences?: SignInExperienceSeeder[];
+  resource_permissions?: ResourcePermissionSeeder[];
+  resource_roles?: ResourceRoleSeeder[];
 };
 
 export type OrganizationSeeder = {

diff --git a/packages/cli/src/commands/database/ogcio/ogcio.ts b/packages/cli/src/commands/database/ogcio/ogcio.ts
@@ -19,7 +19,7 @@ const createDataForTenant = async (
   tenantId: string,
   tenantData: OgcioSeeder
 ) => {
-  if (tenantData.organizations.length > 0) {
+  if (tenantData.organizations?.length) {
     const organizations = await createOrganizations({
       transaction,
       tenantId,
@@ -33,15 +33,15 @@ const createDataForTenant = async (
     toSeed: tenantData,
   });
 
-  if (tenantData.applications.length > 0) {
+  if (tenantData.applications?.length) {
     const applications = await seedApplications({
       transaction,
       tenantId,
       applications: tenantData.applications,
     });
   }
 
-  if (tenantData.resources.length > 0) {
+  if (tenantData.resources?.length) {
     const resources = await seedResources({
       transaction,
       tenantId,
@@ -56,23 +56,23 @@ const createDataForTenant = async (
     });
   }
 
-  if (tenantData.connectors.length > 0) {
+  if (tenantData.connectors?.length) {
     const connectors = await seedConnectors({
       transaction,
       tenantId,
       connectors: tenantData.connectors,
     });
   }
 
-  if (tenantData.sign_in_experiences.length > 0) {
+  if (tenantData.sign_in_experiences?.length) {
     const signInExperiences = await seedSignInExperiences({
       transaction,
       tenantId,
       experiences: tenantData.sign_in_experiences,
     });
   }
 
-  if (tenantData.webhooks.length > 0) {
+  if (tenantData.webhooks?.length) {
     const webhooks = await seedWebhooks({
       transaction,
       tenantId,

diff --git a/packages/cli/src/commands/database/ogcio/organizations-rbac.ts b/packages/cli/src/commands/database/ogcio/organizations-rbac.ts
@@ -86,15 +86,15 @@ export const seedOrganizationRbacData = async (params: {
   transaction: DatabaseTransactionConnection;
   tenantId: string;
   toSeed: {
-    organization_permissions: OrganizationPermissionSeeder[];
-    organization_roles: OrganizationRoleSeeder[];
+    organization_permissions?: OrganizationPermissionSeeder[];
+    organization_roles?: OrganizationRoleSeeder[];
   };
 }): Promise<{
   scopes: OrganizationScopesLists;
   roles: Record<string, OrganizationSeedingRole>;
   relations: SeedingRelation[];
 }> => {
-  if (params.toSeed.organization_permissions.length > 0) {
+  if (params.toSeed.organization_permissions?.length && params.toSeed.organization_roles?.length) {
     const createdScopes = await createScopes({
       transaction: params.transaction,
       tenantId: params.tenantId,

diff --git a/packages/cli/src/commands/database/ogcio/resources-rbac.ts b/packages/cli/src/commands/database/ogcio/resources-rbac.ts
@@ -90,14 +90,14 @@ const createRelations = async (params: {
 const replaceWithResourceIdFromDatabase = (
   seededResources: Record<string, SeedingResource>,
   toSeed: {
-    resource_permissions: ResourcePermissionSeeder[];
-    resource_roles: ResourceRoleSeeder[];
+    resource_permissions?: ResourcePermissionSeeder[];
+    resource_roles?: ResourceRoleSeeder[];
   }
 ): {
-  resource_permissions: ResourcePermissionSeeder[];
-  resource_roles: ResourceRoleSeeder[];
+  resource_permissions?: ResourcePermissionSeeder[];
+  resource_roles?: ResourceRoleSeeder[];
 } => {
-  if (toSeed.resource_permissions.length > 0) {
+  if (toSeed.resource_permissions?.length) {
     for (const permission of toSeed.resource_permissions) {
       const toSetResourceIds = [];
       for (const resourceId of permission.for_resource_ids) {
@@ -112,7 +112,7 @@ const replaceWithResourceIdFromDatabase = (
     }
   }
 
-  if (toSeed.resource_roles.length > 0) {
+  if (toSeed.resource_roles?.length) {
     for (const roles of toSeed.resource_roles) {
       const toSetResourceIds = [];
       for (const permissionGroup of roles.permissions) {
@@ -137,16 +137,16 @@ export const seedResourceRbacData = async (params: {
   tenantId: string;
   seededResources: Record<string, SeedingResource>;
   toSeed: {
-    resource_permissions: ResourcePermissionSeeder[];
-    resource_roles: ResourceRoleSeeder[];
+    resource_permissions?: ResourcePermissionSeeder[];
+    resource_roles?: ResourceRoleSeeder[];
   };
 }): Promise<{
   scopes: ResourceScopesLists;
   roles: Record<string, ResourceSeedingRole>;
   relations: SeedingRelation[];
 }> => {
   params.toSeed = replaceWithResourceIdFromDatabase(params.seededResources, params.toSeed);
-  if (params.toSeed.resource_permissions.length > 0) {
+  if (params.toSeed.resource_permissions?.length && params.toSeed.resource_roles?.length) {
     const createdScopes = await createScopes({
       transaction: params.transaction,
       tenantId: params.tenantId,