Skip to content

Commit d674caf

Browse files
abuchanan-airbyteabuchanan-airbyte
committed
chore: consolidate default user and org constants (#16659)
1 parent d835c80 commit d674caf

File tree

54 files changed

+117
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+117
-121
lines changed

‎airbyte-bootloader/src/main/kotlin/io/airbyte/bootloader/Bootloader.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
package io.airbyte.bootloader
66

7+
import io.airbyte.commons.AUTO_DATAPLANE_GROUP
8+
import io.airbyte.commons.DEFAULT_ORGANIZATION_ID
9+
import io.airbyte.commons.US_DATAPLANE_GROUP
710
import io.airbyte.commons.annotation.InternalForTesting
8-
import io.airbyte.commons.constants.AUTO_DATAPLANE_GROUP
9-
import io.airbyte.commons.constants.DEFAULT_ORGANIZATION_ID
10-
import io.airbyte.commons.constants.US_DATAPLANE_GROUP
1111
import io.airbyte.commons.resources.MoreResources
1212
import io.airbyte.commons.version.AirbyteProtocolVersionRange
1313
import io.airbyte.commons.version.AirbyteVersion
@@ -169,7 +169,7 @@ class Bootloader(
169169

170170
private fun createSsoConfigForDefaultOrgIfNoneExists(organizationPersistence: OrganizationPersistence) {
171171
organizationPersistence
172-
.getSsoConfigForOrganization(OrganizationPersistence.DEFAULT_ORGANIZATION_ID)
172+
.getSsoConfigForOrganization(DEFAULT_ORGANIZATION_ID)
173173
.getOrNull()
174174
?.let {
175175
if (it.keycloakRealm != defaultRealm) {
@@ -186,7 +186,7 @@ class Bootloader(
186186
organizationPersistence.createSsoConfig(
187187
SsoConfig()
188188
.withSsoConfigId(UUID.randomUUID())
189-
.withOrganizationId(OrganizationPersistence.DEFAULT_ORGANIZATION_ID)
189+
.withOrganizationId(DEFAULT_ORGANIZATION_ID)
190190
.withKeycloakRealm(defaultRealm),
191191
)
192192
}
@@ -214,7 +214,7 @@ class Bootloader(
214214
.withTombstone(false)
215215
.withDataplaneGroupId(dataplaneGroupService.getDefaultDataplaneGroupForAirbyteEdition(airbyteEdition).id)
216216
// attach this new workspace to the Default Organization which should always exist at this point.
217-
.withOrganizationId(OrganizationPersistence.DEFAULT_ORGANIZATION_ID)
217+
.withOrganizationId(DEFAULT_ORGANIZATION_ID)
218218
// NOTE: it's safe to use the NoSecrets version since we know that the user hasn't supplied any
219219
// secrets yet.
220220
workspaceService.writeStandardWorkspaceNoSecrets(workspace)
@@ -235,7 +235,7 @@ class Bootloader(
235235
val dataplaneGroup =
236236
DataplaneGroup()
237237
.withId(dataplaneGroupId)
238-
.withOrganizationId(OrganizationPersistence.DEFAULT_ORGANIZATION_ID)
238+
.withOrganizationId(DEFAULT_ORGANIZATION_ID)
239239
.withName(US_DATAPLANE_GROUP)
240240
.withEnabled(true)
241241
.withTombstone(false)
@@ -251,7 +251,7 @@ class Bootloader(
251251
val dataplaneGroup =
252252
DataplaneGroup()
253253
.withId(dataplaneGroupId)
254-
.withOrganizationId(OrganizationPersistence.DEFAULT_ORGANIZATION_ID)
254+
.withOrganizationId(DEFAULT_ORGANIZATION_ID)
255255
.withName(AUTO_DATAPLANE_GROUP)
256256
.withEnabled(true)
257257
.withTombstone(false)

‎airbyte-bootloader/src/main/kotlin/io/airbyte/bootloader/DataplaneInitializer.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
package io.airbyte.bootloader
66

7-
import io.airbyte.commons.constants.DEFAULT_ORGANIZATION_ID
8-
import io.airbyte.commons.constants.US_DATAPLANE_GROUP
7+
import io.airbyte.commons.DEFAULT_ORGANIZATION_ID
8+
import io.airbyte.commons.US_DATAPLANE_GROUP
99
import io.airbyte.config.Configs.AirbyteEdition
1010
import io.airbyte.config.Dataplane
1111
import io.airbyte.config.DataplaneClientCredentials

‎airbyte-bootloader/src/main/kotlin/io/airbyte/bootloader/SecretStorageInitializer.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
package io.airbyte.bootloader
66

7-
import io.airbyte.config.persistence.OrganizationPersistence
8-
import io.airbyte.config.persistence.UserPersistence
7+
import io.airbyte.commons.DEFAULT_ORGANIZATION_ID
8+
import io.airbyte.commons.DEFAULT_USER_ID
99
import io.airbyte.config.secrets.persistence.SecretPersistence.ImplementationTypes
1010
import io.airbyte.data.services.SecretStorageService
1111
import io.airbyte.domain.models.PatchField.Companion.toPatch
@@ -47,11 +47,11 @@ class SecretStorageInitializer(
4747
SecretStorageCreate(
4848
id = SecretStorage.DEFAULT_SECRET_STORAGE_ID,
4949
scopeType = SecretStorageScopeType.ORGANIZATION,
50-
scopeId = OrganizationPersistence.DEFAULT_ORGANIZATION_ID,
50+
scopeId = DEFAULT_ORGANIZATION_ID,
5151
descriptor = DEFAULT_SECRET_STORAGE_DESCRIPTOR,
5252
storageType = configuredSecretStorageType,
5353
configuredFromEnvironment = true,
54-
createdBy = UserId(UserPersistence.DEFAULT_USER_ID),
54+
createdBy = UserId(DEFAULT_USER_ID),
5555
),
5656
)
5757
}
@@ -63,7 +63,7 @@ class SecretStorageInitializer(
6363
}
6464
secretStorageService.patch(
6565
id = existingStorage.id,
66-
updatedBy = UserId(UserPersistence.DEFAULT_USER_ID),
66+
updatedBy = UserId(DEFAULT_USER_ID),
6767
storageType = configuredSecretStorageType.toPatch(),
6868
)
6969
}

‎airbyte-bootloader/src/test-integration/kotlin/io/airbyte/bootloader/BootloaderTest.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
package io.airbyte.bootloader
66

7+
import io.airbyte.commons.DEFAULT_ORGANIZATION_ID
78
import io.airbyte.commons.resources.MoreResources
89
import io.airbyte.commons.version.AirbyteProtocolVersionRange
910
import io.airbyte.commons.version.AirbyteVersion
@@ -297,7 +298,7 @@ internal class BootloaderTest {
297298
if (airbyteEdition != AirbyteEdition.CLOUD) {
298299
Assertions.assertEquals(
299300
DEFAULT_REALM,
300-
organizationPersistence.getSsoConfigForOrganization(OrganizationPersistence.DEFAULT_ORGANIZATION_ID).get().keycloakRealm,
301+
organizationPersistence.getSsoConfigForOrganization(DEFAULT_ORGANIZATION_ID).get().keycloakRealm,
301302
)
302303
}
303304
}
@@ -736,7 +737,7 @@ internal class BootloaderTest {
736737
if (airbyteEdition != AirbyteEdition.CLOUD) {
737738
Assertions.assertEquals(
738739
DEFAULT_REALM,
739-
organizationPersistence.getSsoConfigForOrganization(OrganizationPersistence.DEFAULT_ORGANIZATION_ID).get().keycloakRealm,
740+
organizationPersistence.getSsoConfigForOrganization(DEFAULT_ORGANIZATION_ID).get().keycloakRealm,
740741
)
741742
}
742743
}

‎airbyte-bootloader/src/test/kotlin/io/airbyte/bootloader/DataplaneInitializerTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
package io.airbyte.bootloader
66

7-
import io.airbyte.commons.constants.DEFAULT_ORGANIZATION_ID
8-
import io.airbyte.commons.constants.US_DATAPLANE_GROUP
7+
import io.airbyte.commons.DEFAULT_ORGANIZATION_ID
8+
import io.airbyte.commons.US_DATAPLANE_GROUP
99
import io.airbyte.config.Configs
1010
import io.airbyte.config.Dataplane
1111
import io.airbyte.config.DataplaneClientCredentials

‎airbyte-bootloader/src/test/kotlin/io/airbyte/bootloader/SecretStorageInitializerTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
package io.airbyte.bootloader
66

7-
import io.airbyte.config.persistence.OrganizationPersistence
8-
import io.airbyte.config.persistence.UserPersistence
7+
import io.airbyte.commons.DEFAULT_ORGANIZATION_ID
8+
import io.airbyte.commons.DEFAULT_USER_ID
99
import io.airbyte.config.secrets.persistence.SecretPersistence.ImplementationTypes
1010
import io.airbyte.data.services.SecretStorageService
1111
import io.airbyte.domain.models.PatchField
@@ -28,8 +28,8 @@ import java.util.UUID
2828
class SecretStorageInitializerTest {
2929
private val secretStorageService = mockk<SecretStorageService>(relaxed = true)
3030
private val defaultId = SecretStorage.DEFAULT_SECRET_STORAGE_ID
31-
private val defaultOrgId = OrganizationPersistence.DEFAULT_ORGANIZATION_ID
32-
private val defaultUserId = UserPersistence.DEFAULT_USER_ID
31+
private val defaultOrgId = DEFAULT_ORGANIZATION_ID
32+
private val defaultUserId = DEFAULT_USER_ID
3333
private val defaultDescriptor = "Default Secret Storage"
3434

3535
@BeforeEach

‎airbyte-commons-server/src/main/java/io/airbyte/commons/server/handlers/UserHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package io.airbyte.commons.server.handlers;
66

7-
import static io.airbyte.config.persistence.UserPersistence.DEFAULT_USER_ID;
7+
import static io.airbyte.commons.ConstantsKt.DEFAULT_USER_ID;
88

99
import com.fasterxml.jackson.databind.JsonNode;
1010
import com.google.common.annotations.VisibleForTesting;

‎airbyte-commons-server/src/main/java/io/airbyte/commons/server/validation/EnterpriseActorDefinitionAccessValidator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
package io.airbyte.commons.server.validation;
66

7+
import static io.airbyte.commons.ConstantsKt.DEFAULT_ORGANIZATION_ID;
78
import static io.airbyte.commons.auth.AuthRoleConstants.ADMIN;
89

910
import io.airbyte.commons.license.annotation.RequiresAirbyteProEnabled;
1011
import io.airbyte.commons.server.errors.ApplicationErrorKnownException;
1112
import io.airbyte.commons.server.handlers.PermissionHandler;
1213
import io.airbyte.config.Permission.PermissionType;
13-
import io.airbyte.config.persistence.OrganizationPersistence;
1414
import io.micronaut.context.annotation.Replaces;
1515
import io.micronaut.security.utils.SecurityService;
1616
import jakarta.inject.Singleton;
@@ -55,7 +55,7 @@ public void validateWriteAccess(final UUID actorDefinitionId) throws Application
5555
// are explicitly scoped by organization within the configDb, we can replace this with a more
5656
// conventional RBAC check via @Secured annotations.
5757
final PermissionType defaultOrgPermissionType =
58-
permissionHandler.findPermissionTypeForUserAndOrganization(OrganizationPersistence.DEFAULT_ORGANIZATION_ID, authId);
58+
permissionHandler.findPermissionTypeForUserAndOrganization(DEFAULT_ORGANIZATION_ID, authId);
5959

6060
if (defaultOrgPermissionType.equals(PermissionType.ORGANIZATION_ADMIN)) {
6161
return;

‎airbyte-commons-server/src/test/java/io/airbyte/commons/server/handlers/UserHandlerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package io.airbyte.commons.server.handlers;
66

7-
import static io.airbyte.config.persistence.UserPersistence.DEFAULT_USER_ID;
7+
import static io.airbyte.commons.ConstantsKt.DEFAULT_USER_ID;
88
import static org.junit.jupiter.api.Assertions.assertEquals;
99
import static org.junit.jupiter.api.Assertions.assertFalse;
1010
import static org.junit.jupiter.api.Assertions.assertThrows;

‎airbyte-commons-server/src/test/java/io/airbyte/commons/server/support/CommunityCurrentUserServiceTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
package io.airbyte.commons.server.support;
66

7+
import static io.airbyte.commons.ConstantsKt.DEFAULT_USER_ID;
78
import static org.junit.jupiter.api.Assertions.fail;
89
import static org.mockito.Mockito.times;
910
import static org.mockito.Mockito.verify;
@@ -50,7 +51,7 @@ void testGetCurrentUser() {
5051
// @RequestScope work on the CommunityCurrentUserService
5152
ServerRequestContext.with(HttpRequest.GET("/"), () -> {
5253
try {
53-
final AuthenticatedUser expectedUser = new AuthenticatedUser().withUserId(UserPersistence.DEFAULT_USER_ID);
54+
final AuthenticatedUser expectedUser = new AuthenticatedUser().withUserId(DEFAULT_USER_ID);
5455
when(userPersistence.getDefaultUser()).thenReturn(Optional.ofNullable(expectedUser));
5556

5657
// First call - should fetch default user from userPersistence
@@ -73,12 +74,12 @@ void testGetCurrentUser() {
7374
void testCommunityGetCurrentUserIdIfExists() {
7475
ServerRequestContext.with(HttpRequest.GET("/"), () -> {
7576
try {
76-
final AuthenticatedUser expectedUser = new AuthenticatedUser().withUserId(UserPersistence.DEFAULT_USER_ID);
77+
final AuthenticatedUser expectedUser = new AuthenticatedUser().withUserId(DEFAULT_USER_ID);
7778
when(userPersistence.getDefaultUser()).thenReturn(Optional.of(expectedUser));
7879

7980
final Optional<UUID> userId = currentUserService.getCurrentUserIdIfExists();
8081
Assertions.assertTrue(userId.isPresent());
81-
Assertions.assertEquals(UserPersistence.DEFAULT_USER_ID, userId.get());
82+
Assertions.assertEquals(DEFAULT_USER_ID, userId.get());
8283
} catch (final IOException e) {
8384
fail(e);
8485
}

0 commit comments

Comments
 (0)