make java, python, ruby, go not specify anonymous ecosystems (#491)

Dentity-Development · Mar 17, 2022 · 34d38b5 · 34d38b5
1 parent 2896069
commit 34d38b5
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 38 deletions.
diff --git a/.github/workflows/build-golang.yml b/.github/workflows/build-golang.yml
@@ -36,7 +36,6 @@ jobs:
           repo: trinsic-id/okapi
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ matrix.os-artifact[1] }}
-          run_id: 1903152040  # Last scheduled build before the breaking 1.4.0 release
       - name: Download C header
         uses: dawidd6/action-download-artifact@v2.14.0
         with:

diff --git a/.github/workflows/build-java.yml b/.github/workflows/build-java.yml
@@ -46,7 +46,6 @@ jobs:
           repo: trinsic-id/okapi
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ matrix.os-artifact[1] }}
-          run_id: 1903152040  # Last scheduled build before the breaking 1.4.0 release
       - name: Build with Gradle
         run: |
           python ../devops/build_sdks.py --language=java

diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml
@@ -39,7 +39,6 @@ jobs:
           repo: trinsic-id/okapi
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ matrix.os-artifact[1] }}
-          run_id: 1903152040  # Last scheduled build before the breaking 1.4.0 release
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
@@ -56,8 +55,8 @@ jobs:
           API_GITHUB_TOKEN: ${{ secrets.API_GITHUB_TOKEN }}
           LD_LIBRARY_PATH: "${{ github.workspace }}/libs"
           TEST_SERVER_ENDPOINT: ${{ secrets.TEST_SERVER_ENDPOINT }}
-          # TEST_SERVER_PORT: ${{ secrets.TEST_SERVER_PORT }}
-          # TEST_SERVER_USE_TLS: ${{ secrets.TEST_SERVER_USE_TLS }}
+          TEST_SERVER_PORT: ${{ secrets.TEST_SERVER_PORT }}
+          TEST_SERVER_USE_TLS: ${{ secrets.TEST_SERVER_USE_TLS }}
       - name: Upload Unit Test Results - Python
         if: always()
         uses: actions/upload-artifact@v2
@@ -80,4 +79,4 @@ jobs:
         uses: EnricoMi/publish-unit-test-result-action@v1.23
         with:
           files: 'python_artifacts/**/*.xml'
-          check_name: Python Test Report
+          check_name: Python Test Report
diff --git a/.github/workflows/build-ruby.yml b/.github/workflows/build-ruby.yml
@@ -39,15 +39,6 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: 3.9
-      - name: Download ${{ matrix.os-artifact[0] }} binaries
-        uses: dawidd6/action-download-artifact@v2.17.0
-        with:
-          workflow: "build-libs.yml"
-          path: ./libs/${{ matrix.os-artifact[1] }}
-          repo: trinsic-id/okapi
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          name: ${{ matrix.os-artifact[1] }}
-          run_id: 1903152040  # Last scheduled build before the breaking 1.4.0 release
       - name: Build and run tests
         run: |
           gem install bundler
@@ -58,8 +49,6 @@ jobs:
         working-directory: ruby
         env:
           API_GITHUB_TOKEN: ${{ secrets.API_GITHUB_TOKEN }}
-          RUBY_DLL_PATH: "${{ github.workspace }}/libs/${{ matrix.os-artifact[1] }}"  # Required for Ruby on Windows
-          LD_LIBRARY_PATH: "${{ github.workspace }}/libs/${{ matrix.os-artifact[1] }}"
           TEST_SERVER_ENDPOINT: ${{ secrets.TEST_SERVER_ENDPOINT }}
           TEST_SERVER_PORT: ${{ secrets.TEST_SERVER_PORT }}
           TEST_SERVER_USE_TLS: ${{ secrets.TEST_SERVER_USE_TLS }}

diff --git a/.github/workflows/release-ruby.yml b/.github/workflows/release-ruby.yml
@@ -24,13 +24,6 @@ jobs:
         uses: ruby/setup-ruby@v1.76.0
         with:
           ruby-version: 2.7
-      - name: Download workflow artifact
-        uses: dawidd6/action-download-artifact@v2.14.0
-        with:
-          workflow: "build-libs.yml"
-          path: ./libs
-          branch: main
-          repo: trinsic-id/okapi
       - uses: trinsic-id/set-version@v0.1
         id: setversion
         with:
@@ -53,10 +46,6 @@ jobs:
         env:
           API_GITHUB_TOKEN: ${{ secrets.API_GITHUB_TOKEN }}
           GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_API_TOKEN }}
-          RUBY_DLL_PATH: "${{ github.workspace }}/libs"  # Required for Ruby on Windows
-          DYLD_FALLBACK_LIBRARY_PATH: "${{ github.workspace }}/libs"
-          DYLD_LIBRARY_PATH: "${{ github.workspace }}/libs"
-          LD_LIBRARY_PATH: "${{ github.workspace }}/libs"
           TEST_SERVER_ENDPOINT: ${{ secrets.TEST_SERVER_ENDPOINT }}
           TEST_SERVER_PORT: ${{ secrets.TEST_SERVER_PORT }}
           TEST_SERVER_USE_TLS: ${{ secrets.TEST_SERVER_USE_TLS }}
diff --git a/go/services/services_test.go b/go/services/services_test.go
@@ -286,7 +286,6 @@ func TestEcosystemDemo(t *testing.T) {
 	}
 
 	actualCreate, err := service.CreateEcosystem(context.Background(), &sdk.CreateEcosystemRequest{
-		Name:        "test-sdk-" + uuid.New().String(),
 		Description: "My ecosystem",
 		Uri:         "https://example.com",
 	})

diff --git a/java/src/test/java/trinsic/EcosystemsDemo.java b/java/src/test/java/trinsic/EcosystemsDemo.java
@@ -20,8 +20,7 @@ public static void run() throws IOException, DidException, ExecutionException, I
         var account = accountService.signIn(null).get();
         var service = new ProviderService(TrinsicUtilities.getTrinsicServiceOptions(account));
 
-        var ecosystemName = "test-sdk-" + java.util.UUID.randomUUID();
-        var response = service.createEcosystem(ProviderOuterClass.CreateEcosystemRequest.newBuilder().setName(ecosystemName).setDescription("My ecosystem").setUri("https://example.com").build()).get();
+        var response = service.createEcosystem(ProviderOuterClass.CreateEcosystemRequest.newBuilder().setDescription("My ecosystem").setUri("https://example.com").build()).get();
 
         Assertions.assertNotNull(response.getEcosystem());
         Assertions.assertNotNull(response.getEcosystem().getId());

diff --git a/python/requirements.txt b/python/requirements.txt
@@ -1,4 +1,4 @@
 betterproto~=2.0.0b4
 grpclib~=0.4.3rc2
 grpcio-tools
-trinsic-okapi~=1.4.0
+trinsic-okapi~=1.4.1
diff --git a/python/samples/ecosystem_demo.py b/python/samples/ecosystem_demo.py
@@ -11,11 +11,7 @@ async def ecosystem_demo():
     account = await account_service.sign_in()
     provider_service = ProviderService(server_config=trinsic_config(account))
 
-    ecosystem_name = f"test-sdk-{uuid.uuid4()}"
-    print(f"Ecosystem name={ecosystem_name}")
-
     actual_create = await provider_service.create_ecosystem(
-        name=ecosystem_name,
         description="My ecosystem",
         uri="https://example.com",
     )

diff --git a/python/samples/vaccine_demo.py b/python/samples/vaccine_demo.py
@@ -33,7 +33,7 @@ async def vaccine_demo():
     account = await account_service.sign_in()
     provider_service = ProviderService(server_config=trinsic_config(account))
 
-    ecosystem = await provider_service.create_ecosystem(name=f"test-sdk-{uuid.uuid4()}")
+    ecosystem = await provider_service.create_ecosystem()
     ecosystem_id = ecosystem.ecosystem.id
     # }
 

diff --git a/ruby/test/trinsic_service_test.rb b/ruby/test/trinsic_service_test.rb
@@ -116,7 +116,7 @@ def test_ecosystem_demo
     service = Trinsic::ProviderService.new(Trinsic::trinsic_server(account))
 
     # test create ecosystem
-    actual_create = service.create_ecosystem(Trinsic::Provider_V1::CreateEcosystemRequest.new(:description => "My ecosystem", :name => "test-sdk-#{SecureRandom.uuid}", :uri => "https://example.com"))
+    actual_create = service.create_ecosystem(Trinsic::Provider_V1::CreateEcosystemRequest.new(:description => "My ecosystem", :uri => "https://example.com"))
     assert(actual_create.ecosystem != nil, "Ecosystem should be created")
     assert(actual_create.ecosystem.id != nil, "Id should exist")
     assert(actual_create.ecosystem.id.start_with?("urn:trinsic:ecosystems:"))