feat(experimentalIdentityAndAuth): reorganize package structure into …

…NPM packages
smithy-lang · Oct 10, 2023 · 003f6f1 · 003f6f1
1 parent a88dcfc
commit 003f6f1
Show file tree

Hide file tree

Showing 27 changed files with 59 additions and 41 deletions.
diff --git a/.changeset/big-panthers-collect.md b/.changeset/big-panthers-collect.md
@@ -0,0 +1,5 @@
+---
+"@smithy/experimental-identity-and-auth": patch
+---
+
+Reorganize package structure into NPM packages.
diff --git a/packages/experimental-identity-and-auth/src/index.ts b/packages/experimental-identity-and-auth/src/index.ts
@@ -1,14 +1,8 @@
-export * from "./HttpAuthScheme";
-export * from "./HttpAuthSchemeProvider";
-export * from "./HttpSigner";
-export * from "./IdentityProviderConfig";
-export * from "./SigV4Signer";
-export * from "./apiKeyIdentity";
-export * from "./endpointRuleSet";
-export * from "./httpApiKeyAuth";
-export * from "./httpBearerAuth";
-export * from "./memoizeIdentityProvider";
 export * from "./middleware-http-auth-scheme";
 export * from "./middleware-http-signing";
-export * from "./noAuth";
-export * from "./tokenIdentity";
+export * from "./signature-v4";
+export * from "./types";
+export * from "./util-endpoint-rule-set-auth";
+export * from "./util-http-api-key-auth";
+export * from "./util-http-bearer-auth";
+export * from "./util-identity-and-auth";
diff --git a/...entity-and-auth/src/middleware-http-auth-scheme/getHttpAuthSchemeEndpointRuleSetPlugin.ts b/...entity-and-auth/src/middleware-http-auth-scheme/getHttpAuthSchemeEndpointRuleSetPlugin.ts
@@ -1,7 +1,7 @@
 import { endpointMiddlewareOptions } from "@smithy/middleware-endpoint";
 import { HandlerExecutionContext, Pluggable, RelativeMiddlewareOptions, SerializeHandlerOptions } from "@smithy/types";
 
-import { HttpAuthSchemeParameters } from "../HttpAuthSchemeProvider";
+import { HttpAuthSchemeParameters } from "../types/auth/HttpAuthSchemeProvider";
 import { httpAuthSchemeMiddleware, PreviouslyResolved } from "./httpAuthSchemeMiddleware";
 
 /**

diff --git a/...experimental-identity-and-auth/src/middleware-http-auth-scheme/getHttpAuthSchemePlugin.ts b/...experimental-identity-and-auth/src/middleware-http-auth-scheme/getHttpAuthSchemePlugin.ts
@@ -1,7 +1,7 @@
 import { serializerMiddlewareOption } from "@smithy/middleware-serde";
 import { HandlerExecutionContext, Pluggable, RelativeMiddlewareOptions, SerializeHandlerOptions } from "@smithy/types";
 
-import { HttpAuthSchemeParameters } from "../HttpAuthSchemeProvider";
+import { HttpAuthSchemeParameters } from "../types/auth/HttpAuthSchemeProvider";
 import { httpAuthSchemeMiddleware, PreviouslyResolved } from "./httpAuthSchemeMiddleware";
 
 /**

diff --git a/...xperimental-identity-and-auth/src/middleware-http-auth-scheme/httpAuthSchemeMiddleware.ts b/...xperimental-identity-and-auth/src/middleware-http-auth-scheme/httpAuthSchemeMiddleware.ts
@@ -9,13 +9,13 @@ import {
 } from "@smithy/types";
 import { getSmithyContext } from "@smithy/util-middleware";
 
-import { HttpAuthScheme, HttpAuthSchemeId, SelectedHttpAuthScheme } from "../HttpAuthScheme";
+import { HttpAuthScheme, HttpAuthSchemeId, SelectedHttpAuthScheme } from "../types/auth/HttpAuthScheme";
 import {
   HttpAuthSchemeParameters,
   HttpAuthSchemeParametersProvider,
   HttpAuthSchemeProvider,
-} from "../HttpAuthSchemeProvider";
-import { IdentityProviderConfig } from "../IdentityProviderConfig";
+} from "../types/auth/HttpAuthSchemeProvider";
+import { IdentityProviderConfig } from "../types/identity/IdentityProviderConfig";
 
 /**
  * @internal

diff --git a/packages/experimental-identity-and-auth/src/middleware-http-signing/httpSigningMiddleware.ts b/packages/experimental-identity-and-auth/src/middleware-http-signing/httpSigningMiddleware.ts
@@ -9,7 +9,7 @@ import {
 } from "@smithy/types";
 import { getSmithyContext } from "@smithy/util-middleware";
 
-import { SelectedHttpAuthScheme } from "../HttpAuthScheme";
+import { SelectedHttpAuthScheme } from "../types/auth/HttpAuthScheme";
 
 /**
  * @internal

diff --git a/...ntal-identity-and-auth/src/SigV4Signer.ts → ...-and-auth/src/signature-v4/SigV4Signer.ts b/...ntal-identity-and-auth/src/SigV4Signer.ts → ...-and-auth/src/signature-v4/SigV4Signer.ts
@@ -2,7 +2,7 @@ import { HttpRequest } from "@smithy/protocol-http";
 import { SignatureV4 } from "@smithy/signature-v4";
 import { AwsCredentialIdentity, HttpRequest as IHttpRequest } from "@smithy/types";
 
-import { HttpSigner } from "./HttpSigner";
+import { HttpSigner } from "../types/auth/HttpSigner";
 
 /**
  * @internal

diff --git a/packages/experimental-identity-and-auth/src/signature-v4/index.ts b/packages/experimental-identity-and-auth/src/signature-v4/index.ts
@@ -0,0 +1 @@
+export * from "./SigV4Signer";
diff --git a/...l-identity-and-auth/src/HttpAuthScheme.ts → ...and-auth/src/types/auth/HttpAuthScheme.ts b/...l-identity-and-auth/src/HttpAuthScheme.ts → ...and-auth/src/types/auth/HttpAuthScheme.ts
@@ -1,7 +1,7 @@
 import { Identity, IdentityProvider } from "@smithy/types";
 
+import { IdentityProviderConfig } from "../identity/IdentityProviderConfig";
 import { HttpSigner } from "./HttpSigner";
-import { IdentityProviderConfig } from "./IdentityProviderConfig";
 
 /**
  * ID for {@link HttpAuthScheme}

diff --git a/...ty-and-auth/src/HttpAuthSchemeProvider.ts → .../src/types/auth/HttpAuthSchemeProvider.ts b/...ty-and-auth/src/HttpAuthSchemeProvider.ts → .../src/types/auth/HttpAuthSchemeProvider.ts
diff --git a/...ental-identity-and-auth/src/HttpSigner.ts → ...ity-and-auth/src/types/auth/HttpSigner.ts b/...ental-identity-and-auth/src/HttpSigner.ts → ...ity-and-auth/src/types/auth/HttpSigner.ts
diff --git a/packages/experimental-identity-and-auth/src/types/auth/index.ts b/packages/experimental-identity-and-auth/src/types/auth/index.ts
@@ -0,0 +1,3 @@
+export * from "./HttpAuthScheme";
+export * from "./HttpAuthSchemeProvider";
+export * from "./HttpSigner";
diff --git a/packages/experimental-identity-and-auth/src/types/identity/IdentityProviderConfig.ts b/packages/experimental-identity-and-auth/src/types/identity/IdentityProviderConfig.ts
@@ -0,0 +1,16 @@
+import { Identity, IdentityProvider } from "@smithy/types";
+
+import { HttpAuthSchemeId } from "../auth/HttpAuthScheme";
+
+/**
+ * Interface to get an IdentityProvider for a specified HttpAuthScheme
+ * @internal
+ */
+export interface IdentityProviderConfig {
+  /**
+   * Get the IdentityProvider for a specified HttpAuthScheme.
+   * @param schemeId schemeId of the HttpAuthScheme
+   * @returns IdentityProvider or undefined if HttpAuthScheme is not found
+   */
+  getIdentityProvider(schemeId: HttpAuthSchemeId): IdentityProvider<Identity> | undefined;
+}
diff --git a/...l-identity-and-auth/src/apiKeyIdentity.ts → ...auth/src/types/identity/apiKeyIdentity.ts b/...l-identity-and-auth/src/apiKeyIdentity.ts → ...auth/src/types/identity/apiKeyIdentity.ts
diff --git a/packages/experimental-identity-and-auth/src/types/identity/index.ts b/packages/experimental-identity-and-auth/src/types/identity/index.ts
@@ -0,0 +1,3 @@
+export * from "./apiKeyIdentity";
+export * from "./IdentityProviderConfig";
+export * from "./tokenIdentity";
diff --git a/...al-identity-and-auth/src/tokenIdentity.ts → ...-auth/src/types/identity/tokenIdentity.ts b/...al-identity-and-auth/src/tokenIdentity.ts → ...-auth/src/types/identity/tokenIdentity.ts
diff --git a/packages/experimental-identity-and-auth/src/types/index.ts b/packages/experimental-identity-and-auth/src/types/index.ts
@@ -0,0 +1,2 @@
+export * from "./auth";
+export * from "./identity";
diff --git a/...-identity-and-auth/src/endpointRuleSet.ts → ...endpoint-rule-set-auth/endpointRuleSet.ts b/...-identity-and-auth/src/endpointRuleSet.ts → ...endpoint-rule-set-auth/endpointRuleSet.ts
@@ -2,12 +2,12 @@ import { EndpointParameterInstructions, resolveParams } from "@smithy/middleware
 import { EndpointParameters, EndpointV2, HandlerExecutionContext, Logger } from "@smithy/types";
 import { getSmithyContext } from "@smithy/util-middleware";
 
-import { HttpAuthOption } from "./HttpAuthScheme";
+import { HttpAuthOption } from "../types/auth/HttpAuthScheme";
 import {
   HttpAuthSchemeParameters,
   HttpAuthSchemeParametersProvider,
   HttpAuthSchemeProvider,
-} from "./HttpAuthSchemeProvider";
+} from "../types/auth/HttpAuthSchemeProvider";
 
 /**
  * @internal

diff --git a/packages/experimental-identity-and-auth/src/util-endpoint-rule-set-auth/index.ts b/packages/experimental-identity-and-auth/src/util-endpoint-rule-set-auth/index.ts
@@ -0,0 +1 @@
+export * from "./endpointRuleSet";
diff --git a/...l-identity-and-auth/src/httpApiKeyAuth.ts → .../util-http-api-key-auth/httpApiKeyAuth.ts b/...l-identity-and-auth/src/httpApiKeyAuth.ts → .../util-http-api-key-auth/httpApiKeyAuth.ts
@@ -1,8 +1,8 @@
 import { HttpRequest } from "@smithy/protocol-http";
 import { HttpRequest as IHttpRequest } from "@smithy/types";
 
-import { ApiKeyIdentity } from "./apiKeyIdentity";
-import { HttpSigner } from "./HttpSigner";
+import { HttpSigner } from "../types/auth/HttpSigner";
+import { ApiKeyIdentity } from "../types/identity/apiKeyIdentity";
 
 /**
  * @internal

diff --git a/packages/experimental-identity-and-auth/src/util-http-api-key-auth/index.ts b/packages/experimental-identity-and-auth/src/util-http-api-key-auth/index.ts
@@ -0,0 +1 @@
+export * from "./httpApiKeyAuth";
diff --git a/...l-identity-and-auth/src/httpBearerAuth.ts → ...c/util-http-bearer-auth/httpBearerAuth.ts b/...l-identity-and-auth/src/httpBearerAuth.ts → ...c/util-http-bearer-auth/httpBearerAuth.ts
@@ -1,8 +1,8 @@
 import { HttpRequest } from "@smithy/protocol-http";
 import { HttpRequest as IHttpRequest } from "@smithy/types";
 
-import { HttpSigner } from "./HttpSigner";
-import { TokenIdentity } from "./tokenIdentity";
+import { HttpSigner } from "../types/auth/HttpSigner";
+import { TokenIdentity } from "../types/identity/tokenIdentity";
 
 /**
  * @internal

diff --git a/packages/experimental-identity-and-auth/src/util-http-bearer-auth/index.ts b/packages/experimental-identity-and-auth/src/util-http-bearer-auth/index.ts
@@ -0,0 +1 @@
+export * from "./httpBearerAuth";
diff --git a/...ty-and-auth/src/IdentityProviderConfig.ts → ...and-auth/DefaultIdentityProviderConfig.ts b/...ty-and-auth/src/IdentityProviderConfig.ts → ...and-auth/DefaultIdentityProviderConfig.ts
@@ -1,19 +1,7 @@
 import { Identity, IdentityProvider } from "@smithy/types";
 
-import { HttpAuthSchemeId } from "./HttpAuthScheme";
-
-/**
- * Interface to get an IdentityProvider for a specified HttpAuthScheme
- * @internal
- */
-export interface IdentityProviderConfig {
-  /**
-   * Get the IdentityProvider for a specified HttpAuthScheme.
-   * @param schemeId schemeId of the HttpAuthScheme
-   * @returns IdentityProvider or undefined if HttpAuthScheme is not found
-   */
-  getIdentityProvider(schemeId: HttpAuthSchemeId): IdentityProvider<Identity> | undefined;
-}
+import { HttpAuthSchemeId } from "../types/auth/HttpAuthScheme";
+import { IdentityProviderConfig } from "../types/identity/IdentityProviderConfig";
 
 /**
  * Default implementation of IdentityProviderConfig

diff --git a/packages/experimental-identity-and-auth/src/util-identity-and-auth/index.ts b/packages/experimental-identity-and-auth/src/util-identity-and-auth/index.ts
@@ -0,0 +1,3 @@
+export * from "./DefaultIdentityProviderConfig";
+export * from "./memoizeIdentityProvider";
+export * from "./noAuth";
diff --git a/...y-and-auth/src/memoizeIdentityProvider.ts → ...ntity-and-auth/memoizeIdentityProvider.ts b/...y-and-auth/src/memoizeIdentityProvider.ts → ...ntity-and-auth/memoizeIdentityProvider.ts
diff --git a/...erimental-identity-and-auth/src/noAuth.ts → ...auth/src/util-identity-and-auth/noAuth.ts b/...erimental-identity-and-auth/src/noAuth.ts → ...auth/src/util-identity-and-auth/noAuth.ts
@@ -1,6 +1,6 @@
 import { HttpRequest, Identity } from "@smithy/types";
 
-import { HttpSigner } from "./HttpSigner";
+import { HttpSigner } from "../types/auth/HttpSigner";
 
 /**
  * Signer for the synthetic @smithy.api#noAuth auth scheme.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export * from "./auth";
		export * from "./identity";