diff --git a/packages/@azure/eventgrid/README.md b/packages/@azure/eventgrid/README.md index 0a0c739458c4..767fffb2dba2 100644 --- a/packages/@azure/eventgrid/README.md +++ b/packages/@azure/eventgrid/README.md @@ -1,24 +1,34 @@ -# Azure EventGridClient SDK for JavaScript +## Azure EventGridClient SDK for JavaScript + This package contains an isomorphic SDK for EventGridClient. -## Currently supported environments +### Currently supported environments + - Node.js version 6.x.x or higher - Browser JavaScript -## How to Install -``` +### How to Install + +```bash npm install @azure/eventgrid ``` +### How to use -## How to use +#### nodejs - Authentication, client creation and publishEvents as an example written in TypeScript. + +##### Install @azure/ms-rest-nodeauth + +```bash +npm install @azure/ms-rest-nodeauth +``` -### nodejs - Authentication, client creation and publishEvents as an example written in TypeScript. +##### Sample code -```ts -import * as msRest from "ms-rest-js"; -import * as msRestAzure from "ms-rest-azure-js"; -import * as msRestNodeAuth from "ms-rest-nodeauth"; +```typescript +import * as msRest from "@azure/ms-rest-js"; +import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRestNodeAuth from "@azure/ms-rest-nodeauth"; import { EventGridClient, EventGridModels, EventGridMappers } from "@azure/eventgrid"; const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; @@ -43,7 +53,16 @@ msRestNodeAuth.interactiveLogin().then((creds) => { }); ``` -### browser - Authentication, client creation and publishEvents as an example written in JavaScript. +#### browser - Authentication, client creation and publishEvents as an example written in JavaScript. + +##### Install @azure/ms-rest-browserauth + +```bash +npm install @azure/ms-rest-browserauth +``` + +##### Sample code + See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser. - index.html @@ -52,11 +71,11 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to @azure/eventgrid sample - - - + + + - - - + ``` -# Related projects - - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) +## Related projects + +- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) diff --git a/packages/@azure/eventgrid/lib/eventGridClient.ts b/packages/@azure/eventgrid/lib/eventGridClient.ts index 8f69e349df19..2405169a7c16 100644 --- a/packages/@azure/eventgrid/lib/eventGridClient.ts +++ b/packages/@azure/eventgrid/lib/eventGridClient.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "ms-rest-js"; -import * as msRestAzure from "ms-rest-azure-js"; +import * as msRest from "@azure/ms-rest-js"; +import * as msRestAzure from "@azure/ms-rest-azure-js"; import * as Models from "./models"; import * as Mappers from "./models/mappers"; import * as Parameters from "./models/parameters"; diff --git a/packages/@azure/eventgrid/lib/eventGridClientContext.ts b/packages/@azure/eventgrid/lib/eventGridClientContext.ts index 9c4cab5ef630..2847ccadf7e7 100644 --- a/packages/@azure/eventgrid/lib/eventGridClientContext.ts +++ b/packages/@azure/eventgrid/lib/eventGridClientContext.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "ms-rest-js"; -import * as msRestAzure from "ms-rest-azure-js"; +import * as msRest from "@azure/ms-rest-js"; +import * as msRestAzure from "@azure/ms-rest-azure-js"; const packageName = "@azure/eventgrid"; const packageVersion = "0.1.0"; diff --git a/packages/@azure/eventgrid/lib/models/index.ts b/packages/@azure/eventgrid/lib/models/index.ts index 9f227b600e5a..0b7a2787a1fc 100644 --- a/packages/@azure/eventgrid/lib/models/index.ts +++ b/packages/@azure/eventgrid/lib/models/index.ts @@ -8,7 +8,7 @@ * regenerated. */ -import { BaseResource, CloudError } from "ms-rest-azure-js"; +import { BaseResource, CloudError } from "@azure/ms-rest-azure-js"; export { BaseResource, CloudError }; @@ -1117,6 +1117,54 @@ export interface ContainerRegistryImagePushedEventData extends ContainerRegistry export interface ContainerRegistryImageDeletedEventData extends ContainerRegistryEventData { } +/** + * @interface + * An interface representing ContainerRegistryArtifactEventData. + * The content of the event request message. + * + */ +export interface ContainerRegistryArtifactEventData { + /** + * @member {string} [id] The event ID. + */ + id?: string; + /** + * @member {Date} [timestamp] The time at which the event occurred. + */ + timestamp?: Date; + /** + * @member {string} [action] The action that encompasses the provided event. + */ + action?: string; + /** + * @member {ContainerRegistryArtifactEventTarget} [target] The target of the + * event. + */ + target?: ContainerRegistryArtifactEventTarget; +} + +/** + * @interface + * An interface representing ContainerRegistryChartPushedEventData. + * Schema of the Data property of an EventGridEvent for a + * Microsoft.ContainerRegistry.ChartPushed event. + * + * @extends ContainerRegistryArtifactEventData + */ +export interface ContainerRegistryChartPushedEventData extends ContainerRegistryArtifactEventData { +} + +/** + * @interface + * An interface representing ContainerRegistryChartDeletedEventData. + * Schema of the Data property of an EventGridEvent for a + * Microsoft.ContainerRegistry.ChartDeleted event. + * + * @extends ContainerRegistryArtifactEventData + */ +export interface ContainerRegistryChartDeletedEventData extends ContainerRegistryArtifactEventData { +} + /** * @interface * An interface representing ContainerRegistryEventTarget. @@ -1225,6 +1273,43 @@ export interface ContainerRegistryEventSource { instanceID?: string; } +/** + * @interface + * An interface representing ContainerRegistryArtifactEventTarget. + * The target of the event. + * + */ +export interface ContainerRegistryArtifactEventTarget { + /** + * @member {string} [mediaType] The MIME type of the artifact. + */ + mediaType?: string; + /** + * @member {number} [size] The size in bytes of the artifact. + */ + size?: number; + /** + * @member {string} [digest] The digest of the artifact. + */ + digest?: string; + /** + * @member {string} [repository] The repository name of the artifact. + */ + repository?: string; + /** + * @member {string} [tag] The tag of the artifact. + */ + tag?: string; + /** + * @member {string} [name] The name of the artifact. + */ + name?: string; + /** + * @member {string} [version] The version of the artifact. + */ + version?: string; +} + /** * @interface * An interface representing ServiceBusActiveMessagesAvailableWithNoListenersEventData. diff --git a/packages/@azure/eventgrid/lib/models/mappers.ts b/packages/@azure/eventgrid/lib/models/mappers.ts index c21a52bd3dc5..9d6ffb41fd7e 100644 --- a/packages/@azure/eventgrid/lib/models/mappers.ts +++ b/packages/@azure/eventgrid/lib/models/mappers.ts @@ -8,8 +8,8 @@ * regenerated. */ -import { CloudErrorMapper, BaseResourceMapper } from "ms-rest-azure-js"; -import * as msRest from "ms-rest-js"; +import { CloudErrorMapper, BaseResourceMapper } from "@azure/ms-rest-azure-js"; +import * as msRest from "@azure/ms-rest-js"; export const CloudError = CloudErrorMapper; export const BaseResource = BaseResourceMapper; @@ -1377,6 +1377,63 @@ export const ContainerRegistryImageDeletedEventData: msRest.CompositeMapper = { } }; +export const ContainerRegistryArtifactEventData: msRest.CompositeMapper = { + serializedName: "ContainerRegistryArtifactEventData", + type: { + name: "Composite", + className: "ContainerRegistryArtifactEventData", + modelProperties: { + id: { + serializedName: "id", + type: { + name: "String" + } + }, + timestamp: { + serializedName: "timestamp", + type: { + name: "DateTime" + } + }, + action: { + serializedName: "action", + type: { + name: "String" + } + }, + target: { + serializedName: "target", + type: { + name: "Composite", + className: "ContainerRegistryArtifactEventTarget" + } + } + } + } +}; + +export const ContainerRegistryChartPushedEventData: msRest.CompositeMapper = { + serializedName: "ContainerRegistryChartPushedEventData", + type: { + name: "Composite", + className: "ContainerRegistryChartPushedEventData", + modelProperties: { + ...ContainerRegistryArtifactEventData.type.modelProperties + } + } +}; + +export const ContainerRegistryChartDeletedEventData: msRest.CompositeMapper = { + serializedName: "ContainerRegistryChartDeletedEventData", + type: { + name: "Composite", + className: "ContainerRegistryChartDeletedEventData", + modelProperties: { + ...ContainerRegistryArtifactEventData.type.modelProperties + } + } +}; + export const ContainerRegistryEventTarget: msRest.CompositeMapper = { serializedName: "ContainerRegistryEventTarget", type: { @@ -1507,6 +1564,58 @@ export const ContainerRegistryEventSource: msRest.CompositeMapper = { } }; +export const ContainerRegistryArtifactEventTarget: msRest.CompositeMapper = { + serializedName: "ContainerRegistryArtifactEventTarget", + type: { + name: "Composite", + className: "ContainerRegistryArtifactEventTarget", + modelProperties: { + mediaType: { + serializedName: "mediaType", + type: { + name: "String" + } + }, + size: { + serializedName: "size", + type: { + name: "Number" + } + }, + digest: { + serializedName: "digest", + type: { + name: "String" + } + }, + repository: { + serializedName: "repository", + type: { + name: "String" + } + }, + tag: { + serializedName: "tag", + type: { + name: "String" + } + }, + name: { + serializedName: "name", + type: { + name: "String" + } + }, + version: { + serializedName: "version", + type: { + name: "String" + } + } + } + } +}; + export const ServiceBusActiveMessagesAvailableWithNoListenersEventData: msRest.CompositeMapper = { serializedName: "ServiceBusActiveMessagesAvailableWithNoListenersEventData", type: { @@ -1891,11 +2000,6 @@ export const MediaJobOutputStateChangeEventData: msRest.CompositeMapper = { serializedName: "output", type: { name: "Composite", - polymorphicDiscriminator: { - serializedName: "@odata.type", - clientName: "odatatype" - }, - uberParent: "MediaJobOutput", className: "MediaJobOutput" } }, @@ -1961,11 +2065,6 @@ export const MediaJobFinishedEventData: msRest.CompositeMapper = { element: { type: { name: "Composite", - polymorphicDiscriminator: { - serializedName: "@odata.type", - clientName: "odatatype" - }, - uberParent: "MediaJobOutput", className: "MediaJobOutput" } } @@ -1989,11 +2088,6 @@ export const MediaJobCanceledEventData: msRest.CompositeMapper = { element: { type: { name: "Composite", - polymorphicDiscriminator: { - serializedName: "@odata.type", - clientName: "odatatype" - }, - uberParent: "MediaJobOutput", className: "MediaJobOutput" } } @@ -2017,11 +2111,6 @@ export const MediaJobErroredEventData: msRest.CompositeMapper = { element: { type: { name: "Composite", - polymorphicDiscriminator: { - serializedName: "@odata.type", - clientName: "odatatype" - }, - uberParent: "MediaJobOutput", className: "MediaJobOutput" } } diff --git a/packages/@azure/eventgrid/lib/models/parameters.ts b/packages/@azure/eventgrid/lib/models/parameters.ts index 0650cdea3493..e2fe552eddfe 100644 --- a/packages/@azure/eventgrid/lib/models/parameters.ts +++ b/packages/@azure/eventgrid/lib/models/parameters.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "ms-rest-js"; +import * as msRest from "@azure/ms-rest-js"; export const acceptLanguage: msRest.OperationParameter = { parameterPath: "acceptLanguage", diff --git a/packages/@azure/eventgrid/package.json b/packages/@azure/eventgrid/package.json index 98bacb66cc96..c6ac5b815bb6 100644 --- a/packages/@azure/eventgrid/package.json +++ b/packages/@azure/eventgrid/package.json @@ -4,8 +4,8 @@ "description": "EventGridClient Library with typescript type definitions for node.js and browser.", "version": "0.1.0", "dependencies": { - "ms-rest-azure-js": "^1.0.181", - "ms-rest-js": "^1.0.460", + "@azure/ms-rest-azure-js": "^1.2.0", + "@azure/ms-rest-js": "^1.2.0", "tslib": "^1.9.3" }, "keywords": [ @@ -23,6 +23,7 @@ "typescript": "^3.1.1", "rollup": "^0.66.2", "rollup-plugin-node-resolve": "^3.4.0", + "rollup-plugin-sourcemaps": "^0.4.2", "uglify-js": "^3.4.9" }, "homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/packages/@azure/eventgrid", diff --git a/packages/@azure/eventgrid/rollup.config.js b/packages/@azure/eventgrid/rollup.config.js index 72e32c42a07d..17ee8655d7c9 100644 --- a/packages/@azure/eventgrid/rollup.config.js +++ b/packages/@azure/eventgrid/rollup.config.js @@ -1,31 +1,37 @@ +import rollup from "rollup"; import nodeResolve from "rollup-plugin-node-resolve"; +import sourcemaps from "rollup-plugin-sourcemaps"; + /** - * @type {import('rollup').RollupFileOptions} + * @type {rollup.RollupFileOptions} */ const config = { - input: './esm/eventGridClient.js', - external: ["ms-rest-js", "ms-rest-azure-js"], + input: "./esm/eventGridClient.js", + external: [ + "@azure/ms-rest-js", + "@azure/ms-rest-azure-js" + ], output: { file: "./dist/eventgrid.js", format: "umd", name: "Azure.Eventgrid", sourcemap: true, globals: { - "ms-rest-js": "msRest", - "ms-rest-azure-js": "msRestAzure" + "@azure/ms-rest-js": "msRest", + "@azure/ms-rest-azure-js": "msRestAzure" }, banner: `/* * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Licensed under the MIT License. See License.txt in the project root for license information. * * Code generated by Microsoft (R) AutoRest Code Generator. - * Changes may cause incorrect behavior and will be lost if the code is - * regenerated. + * Changes may cause incorrect behavior and will be lost if the code is regenerated. */` }, plugins: [ - nodeResolve({ module: true }) + nodeResolve({ module: true }), + sourcemaps() ] }; + export default config; diff --git a/packages/@azure/eventgrid/tsconfig.json b/packages/@azure/eventgrid/tsconfig.json index f32d1664f320..51ea90961ce5 100644 --- a/packages/@azure/eventgrid/tsconfig.json +++ b/packages/@azure/eventgrid/tsconfig.json @@ -14,6 +14,6 @@ "outDir": "./esm", "importHelpers": true }, - "include": ["./lib/**/*"], + "include": ["./lib/**/*.ts"], "exclude": ["node_modules"] }