-
Notifications
You must be signed in to change notification settings - Fork 92
Bump Azurite to 3.37.0, refactor Azure client #2543
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
SylvainSenechal
wants to merge
3
commits into
development/2.16
Choose a base branch
from
improvement/ZENKO-5330
base: development/2.16
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| import { | ||
| BlobServiceClient, | ||
| StorageSharedKeyCredential, | ||
| BlobGetPropertiesResponse, | ||
| BlobItem, | ||
| } from '@azure/storage-blob'; | ||
|
|
||
| import { | ||
| QueueServiceClient, | ||
| StorageSharedKeyCredential as StorageQueueSharedKeyCredential, | ||
| } from '@azure/storage-queue'; | ||
|
|
||
| export type AzureCreds = { | ||
| accountName: string; | ||
| accountKey: string; | ||
| }; | ||
|
|
||
| function requireEnv(name: string): string { | ||
| const value = process.env[name]; | ||
| if (!value) { | ||
| throw new Error(`Missing required environment variable: ${name}`); | ||
| } | ||
| return value; | ||
| } | ||
|
|
||
| export default class AzureClient { | ||
| private readonly blobClient: BlobServiceClient; | ||
| private readonly queueClient: QueueServiceClient; | ||
|
|
||
| constructor(creds: AzureCreds) { | ||
| this.blobClient = new BlobServiceClient( | ||
| requireEnv('AZURE_BACKEND_ENDPOINT'), | ||
| new StorageSharedKeyCredential(creds.accountName, creds.accountKey), | ||
| ); | ||
| this.queueClient = new QueueServiceClient( | ||
| requireEnv('AZURE_BACKEND_QUEUE_ENDPOINT'), | ||
| new StorageQueueSharedKeyCredential(creds.accountName, creds.accountKey), | ||
| ); | ||
| } | ||
|
|
||
| async listBlobs(container: string): Promise<BlobItem[]> { | ||
| const blobList: BlobItem[] = []; | ||
| const iter = await this.blobClient.getContainerClient(container).listBlobsFlat(); | ||
| let blobItem = await iter.next(); | ||
| while (!blobItem.done) { | ||
| blobList.push(blobItem.value); | ||
| blobItem = await iter.next(); | ||
| } | ||
| return blobList; | ||
| } | ||
|
|
||
| async getBlobProperties(container: string, blob: string): Promise<BlobGetPropertiesResponse> { | ||
| const blobClient = this.blobClient.getContainerClient(container).getBlockBlobClient(blob); | ||
| return blobClient.getProperties(); | ||
| } | ||
|
|
||
| async blobExists(container: string, blob: string): Promise<boolean> { | ||
| const blobClient = this.blobClient.getContainerClient(container).getBlockBlobClient(blob); | ||
| return blobClient.exists(); | ||
| } | ||
|
|
||
| async deleteBlob(container: string, blob: string): Promise<boolean> { | ||
| const res = await this.blobClient | ||
| .getContainerClient(container) | ||
| .getBlockBlobClient(blob) | ||
| .deleteIfExists(); | ||
| return res.succeeded; | ||
| } | ||
|
|
||
| async downloadBlob(container: string, blob: string): Promise<Buffer> { | ||
| return this.blobClient.getContainerClient(container).getBlockBlobClient(blob).downloadToBuffer(); | ||
| } | ||
|
|
||
| async sendBlobCreatedEventToQueue(queue: string, container: string, blob: string): Promise<void> { | ||
| const message = { | ||
| topic: '/subscriptions/0/resourceGroups/Storage/providers/Microsoft.Storage/storageAccounts/account', | ||
| subject: `/blobServices/default/containers/${container}/blobs/${blob}`, | ||
| eventType: 'Microsoft.Storage.BlobCreated', | ||
| eventTime: '2017-06-26T18:41:00.9584103Z', | ||
| id: '831e1650-001e-001b-66ab-eeb76e069631', | ||
| data: { | ||
| api: 'CopyBlob', | ||
| clientRequestId: '6d79dbfb-0e37-4fc4-981f-442c9ca65760', | ||
| requestId: '831e1650-001e-001b-66ab-eeb76e000000', | ||
| eTag: "'0x8D4BCC2E4835CD0'", | ||
| contentType: 'text/plain', | ||
| contentLength: 524288, | ||
| blobType: 'BlockBlob', | ||
| url: `https://my-storage-account.blob.core.windows.net/${container}/${blob}`, | ||
| sequencer: '00000000000004420000000000028963', | ||
| storageDiagnostics: { | ||
| batchId: 'b68529f3-68cd-4744-baa4-3c0498ec19f0', | ||
| }, | ||
| }, | ||
| dataVersion: '', | ||
| metadataVersion: '1', | ||
| }; | ||
|
|
||
| const msgString = JSON.stringify(message); | ||
| const msgBuffer = Buffer.from(msgString); | ||
|
|
||
| await this.queueClient.getQueueClient(queue).sendMessage(msgBuffer.toString('base64')); | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is moslty a copy of https://github.com/scality/cli-testing/blob/development/1.3/utils/AzureHelper.ts
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what is the point of copying it here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be easier to have the clients we use directly defined on this repo.
If we ever need to modify them, we won't need to make a pr in cli-testing
Here I'm not sure I would have been able to bump Azurite to 3.37 without making changes in cli testing for example