Skip to content
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

Add AzureCC provider, call sidecar to get MAA token #5

Merged
merged 22 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
de57cb6
Add AzureCC provider, call sidecar to get MAA token
lunwang-ttd Sep 29, 2023
144b52e
UT for AzureCC provider
lunwang-ttd Oct 9, 2023
625c6d0
Refine naming and document for Azure CC
lunwang-ttd Oct 10, 2023
5682ea8
Refine Azure CC provider to accept a MAA base URL
lunwang-ttd Oct 10, 2023
f39c079
Fix GitHub workflows
lunwang-ttd Oct 10, 2023
7616b33
Fix maven plugin
lunwang-ttd Oct 10, 2023
ab65f3b
Fix javadoc for Azure CC provider
lunwang-ttd Oct 10, 2023
57d2215
Add empty version.json
lunwang-ttd Oct 10, 2023
8f8d865
Released Snapshot version: 0.0.0-SNAPSHOT
Oct 10, 2023
5b4b138
Set version.json
lunwang-ttd Oct 10, 2023
7d22327
Merge branch 'lun-UID2-1905-azurecc-provider' of github.com-lunwang-t…
lunwang-ttd Oct 10, 2023
71b0bf7
Released Snapshot version: 1.2.2-SNAPSHOT
Oct 10, 2023
d98c33d
Refine Azure CC error message
lunwang-ttd Oct 10, 2023
7fc9500
Merge branch 'lun-UID2-1905-azurecc-provider' of github.com-lunwang-t…
lunwang-ttd Oct 10, 2023
05ebde8
Update Skr port to 9000
lunwang-ttd Oct 10, 2023
8ae7b69
Released Snapshot version: 1.2.5-SNAPSHOT
Oct 10, 2023
80bceda
Azure CC: hard code location for now
lunwang-ttd Oct 10, 2023
150b135
Merge branch 'lun-UID2-1905-azurecc-provider' of github.com-lunwang-t…
lunwang-ttd Oct 10, 2023
f25dfe7
Released Snapshot version: 1.2.7-SNAPSHOT
Oct 10, 2023
ff4037f
Define RuntimeData class
lunwang-ttd Oct 11, 2023
79f5b11
Merge branch 'lun-UID2-1905-azurecc-provider' of github.com-lunwang-t…
lunwang-ttd Oct 11, 2023
79a996e
Released Snapshot version: 1.2.9-SNAPSHOT
Oct 12, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: Build and Test
on: [pull_request, push, workflow_dispatch]

jobs:
build:
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-build-and-test.yaml@main
with:
java_version: "11"
secrets: inherit
11 changes: 0 additions & 11 deletions .github/workflows/build.yaml

This file was deleted.

39 changes: 0 additions & 39 deletions .github/workflows/check_version/action.yaml

This file was deleted.

39 changes: 0 additions & 39 deletions .github/workflows/create-release-branch.yaml

This file was deleted.

30 changes: 0 additions & 30 deletions .github/workflows/download_gpg_key/action.yaml

This file was deleted.

17 changes: 17 additions & 0 deletions .github/workflows/publish-major.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Publish Major Package
on:
workflow_dispatch:
inputs:
publish_to_maven:
description: 'True to publish the artifacts to maven repository, false to skip the step'
default: true
required: false
type: boolean
jobs:
build-publish-package:
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-java-publish-versioned-package.yaml@main
with:
release_type: 'Major'
publish_to_maven: ${{ inputs.publish_to_maven }}
java_version: "11"
secrets: inherit
17 changes: 17 additions & 0 deletions .github/workflows/publish-minor.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Publish Minor Package
on:
workflow_dispatch:
inputs:
publish_to_maven:
description: 'True to publish the artifacts to maven repository, false to skip the step'
default: true
required: false
type: boolean
jobs:
build-publish-package:
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-java-publish-versioned-package.yaml@main
with:
release_type: 'Minor'
publish_to_maven: ${{ inputs.publish_to_maven }}
java_version: "11"
secrets: inherit
17 changes: 17 additions & 0 deletions .github/workflows/publish-patch.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Publish Patch Package
on:
workflow_dispatch:
inputs:
publish_to_maven:
description: 'True to publish the artifacts to maven repository, false to skip the step'
default: true
required: false
type: boolean
jobs:
build-publish-package:
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-java-publish-versioned-package.yaml@main
with:
release_type: 'Patch'
publish_to_maven: ${{ inputs.publish_to_maven }}
java_version: "11"
secrets: inherit
33 changes: 16 additions & 17 deletions .github/workflows/publish-snapshot.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
name: Publish Snapshot
on: workflow_dispatch

name: Publish Snapshot Package
on:
workflow_dispatch:
inputs:
publish_to_maven:
description: 'True to publish the artifacts to maven repository, false to skip the step'
default: true
required: false
type: boolean
jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./.github/workflows/download_gpg_key
with:
key: ${{ secrets.GPG_KEY }}
- name: Check Version is snapshot
id: check_verion
uses: ./.github/workflows/check_version
with:
needs_snapshot: 'true'
- name: Deploy Snapshot
run: mvn -B -Drepo.id=ossrh -Drepo.login="{{ secrets.SONATYPE_REPO_ACCOUNT }}" -Drepo.pwd="${{ secrets.SONATYPE_REPO_PASSWORD }}" -Dgpg.passphrase="${{ secrets.GPG_PASSPHRASE }}" clean deploy
build-publish-package:
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-java-publish-versioned-package.yaml@main
with:
release_type: 'Snapshot'
publish_to_maven: ${{ inputs.publish_to_maven }}
java_version: "11"
secrets: inherit
47 changes: 0 additions & 47 deletions .github/workflows/release-major-minor.yaml

This file was deleted.

47 changes: 0 additions & 47 deletions .github/workflows/release-patch.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions .github/workflows/release.yaml

This file was deleted.

36 changes: 33 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.uid2</groupId>
<artifactId>attestation-azure</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.7-SNAPSHOT</version>

<name>${project.groupId}:${project.artifactId}</name>
<description>Azure SGX Enclave attestation</description>
Expand Down Expand Up @@ -38,6 +38,24 @@
<artifactId>uid2-attestation-api</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>5.2.0</version>
<scope>test</scope>
</dependency>
</dependencies>

<distributionManagement>
Expand All @@ -57,8 +75,8 @@
<arg>-h</arg>
<arg>target/headers</arg>
</compilerArgs>
<source>8</source>
<target>8</target>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -136,6 +154,18 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading