Skip to content

Commit 263e90d

Browse files
authored
Major folder restructuring (#73)
* restructured src folder structure to be friendlier for tables * Fixed some things so that API report has not changed at all * restructured tests folder to reflect new src structure * fixed test suite names to match new folder structure
1 parent 5dbedcd commit 263e90d

File tree

157 files changed

+781
-682
lines changed

Some content is hidden

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

157 files changed

+781
-682
lines changed

src/devops/astra-admin.ts renamed to src/administration/astra-admin.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ import {
2020
DatabaseConfig,
2121
FullDatabaseInfo,
2222
ListDatabasesOptions,
23-
} from '@/src/devops/types';
24-
import { Db, DbSpawnOptions } from '@/src/data-api';
25-
import { DEFAULT_DEVOPS_API_ENDPOINTS, DEFAULT_KEYSPACE, DevOpsAPIHttpClient, HttpMethods } from '@/src/api';
26-
import { AstraDbAdmin } from '@/src/devops/astra-db-admin';
27-
import { InternalRootClientOpts } from '@/src/client/types';
28-
import { mkDb } from '@/src/data-api/db';
29-
import { resolveKeyspace, TokenProvider, WithTimeout } from '@/src/common';
30-
import { validateAdminOpts } from '@/src/devops/utils';
23+
} from '@/src/administration/types';
24+
import { AstraDbAdmin } from '@/src/administration/astra-db-admin';
25+
import { DbSpawnOptions, InternalRootClientOpts } from '@/src/client/types';
26+
import { Db, mkDb } from '@/src/db/db';
27+
import { validateAdminOpts } from '@/src/administration/utils';
28+
import { DEFAULT_DEVOPS_API_ENDPOINTS, DEFAULT_KEYSPACE, HttpMethods } from '@/src/lib/api/constants';
29+
import { DevOpsAPIHttpClient } from '@/src/lib/api/clients/devops-api-http-client';
30+
import { TokenProvider, WithTimeout } from '@/src/lib';
31+
import { resolveKeyspace } from '@/src/lib/utils';
3132

3233
/**
3334
* An administrative class for managing Astra databases, including creating, listing, and deleting databases.

src/devops/astra-db-admin.ts renamed to src/administration/astra-db-admin.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@ import {
1919
CreateKeyspaceOptions,
2020
CreateNamespaceOptions,
2121
FullDatabaseInfo,
22-
} from '@/src/devops/types';
23-
import { DEFAULT_DEVOPS_API_ENDPOINTS, DevOpsAPIHttpClient, HttpMethods } from '@/src/api';
24-
import { Db } from '@/src/data-api';
25-
import { DbAdmin } from '@/src/devops/db-admin';
26-
import { WithTimeout } from '@/src/common/types';
22+
} from '@/src/administration/types';
23+
import { DbAdmin } from '@/src/administration/db-admin';
24+
import { WithTimeout } from '@/src/lib/types';
2725
import { InternalRootClientOpts } from '@/src/client/types';
28-
import { isNullish, StaticTokenProvider, TokenProvider } from '@/src/common';
29-
import { extractAstraEnvironment, validateAdminOpts } from '@/src/devops/utils';
30-
import { FindEmbeddingProvidersResult } from '@/src/devops/types/db-admin/find-embedding-providers';
26+
import { extractAstraEnvironment, validateAdminOpts } from '@/src/administration/utils';
27+
import { FindEmbeddingProvidersResult } from '@/src/administration/types/db-admin/find-embedding-providers';
28+
import { DEFAULT_DEVOPS_API_ENDPOINTS, HttpMethods } from '@/src/lib/api/constants';
29+
import { DevOpsAPIHttpClient } from '@/src/lib/api/clients/devops-api-http-client';
30+
import { Db } from '@/src/db';
31+
import { StaticTokenProvider, TokenProvider } from '@/src/lib';
32+
import { isNullish } from '@/src/lib/utils';
3133

3234
/**
3335
* An administrative class for managing Astra databases, including creating, listing, and deleting keyspaces.

src/devops/data-api-db-admin.ts renamed to src/administration/data-api-db-admin.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ import {
1818
AdminSpawnOptions,
1919
LocalCreateKeyspaceOptions,
2020
LocalCreateNamespaceOptions,
21-
} from '@/src/devops/types';
22-
import { DataAPIHttpClient } from '@/src/api';
23-
import { Db } from '@/src/data-api';
24-
import { DbAdmin } from '@/src/devops/db-admin';
25-
import { WithTimeout } from '@/src/common/types';
26-
import { validateAdminOpts } from '@/src/devops/utils';
27-
import { FindEmbeddingProvidersResult } from '@/src/devops/types/db-admin/find-embedding-providers';
21+
} from '@/src/administration/types';
22+
import { DbAdmin } from '@/src/administration/db-admin';
23+
import { WithTimeout } from '@/src/lib/types';
24+
import { validateAdminOpts } from '@/src/administration/utils';
25+
import { FindEmbeddingProvidersResult } from '@/src/administration/types/db-admin/find-embedding-providers';
26+
import { DataAPIHttpClient } from '@/src/lib/api/clients/data-api-http-client';
27+
import { Db } from '@/src/db';
2828

2929
/**
3030
* An administrative class for managing non-Astra databases, including creating, listing, and deleting keyspaces.

src/devops/db-admin.ts renamed to src/administration/db-admin.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
// limitations under the License.
1414
// noinspection ExceptionCaughtLocallyJS
1515

16-
import { AdminBlockingOptions, CreateKeyspaceOptions, CreateNamespaceOptions } from '@/src/devops/types';
17-
import { Db } from '@/src/data-api';
18-
import { FindEmbeddingProvidersResult } from '@/src/devops/types/db-admin/find-embedding-providers';
19-
import { WithTimeout } from '@/src/common';
16+
import { AdminBlockingOptions, CreateKeyspaceOptions, CreateNamespaceOptions } from '@/src/administration/types';
17+
import { FindEmbeddingProvidersResult } from '@/src/administration/types/db-admin/find-embedding-providers';
18+
import { WithTimeout } from '@/src/lib';
19+
import { Db } from '@/src/db';
2020

2121
/**
2222
* Represents some DatabaseAdmin class used for managing some specific database.

src/devops/errors.ts renamed to src/administration/errors.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
import { FullDatabaseInfo } from '@/src/devops/types';
16-
import { FetcherResponseInfo } from '@/src/api';
15+
import { FullDatabaseInfo } from '@/src/administration/types';
16+
import { FetcherResponseInfo } from '@/src/lib/api';
1717

1818
/**
1919
* A representation of what went wrong when interacting with the DevOps API.

src/devops/events.ts renamed to src/administration/events.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
import { DevOpsAPIRequestInfo, hrTimeMs } from '@/src/api';
15+
import { DevOpsAPIRequestInfo } from '@/src/lib/api/clients/devops-api-http-client';
16+
import { hrTimeMs } from '@/src/lib/api/clients/http-client';
1617

1718
/**
1819
* The events emitted by the {@link DataAPIClient}. These events are emitted at various stages of the
File renamed without changes.

src/devops/types/admin/admin-common.ts renamed to src/administration/types/admin/admin-common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
import { WithTimeout } from '@/src/common/types';
15+
import { WithTimeout } from '@/src/lib/types';
1616

1717
/**
1818
* Represents the available cloud providers that Astra offers.

src/devops/types/admin/create-database.ts renamed to src/administration/types/admin/create-database.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
import { AdminBlockingOptions, DatabaseCloudProvider } from '@/src/devops/types';
15+
import { AdminBlockingOptions, DatabaseCloudProvider } from '@/src/administration/types';
1616

17-
import { DbSpawnOptions } from '@/src/data-api';
17+
18+
import { DbSpawnOptions } from '@/src/client';
1819

1920
/**
2021
* Represents the options for creating a database.

src/devops/types/admin/database-info.ts renamed to src/administration/types/admin/database-info.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
import { DatabaseAction, DatabaseCloudProvider, DatabaseStatus, DatabaseTier } from '@/src/devops/types';
15+
import { DatabaseAction, DatabaseCloudProvider, DatabaseStatus, DatabaseTier } from '@/src/administration/types';
1616

1717
/**
1818
* Represents the complete information about a database.

0 commit comments

Comments
 (0)