V1 #63

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

Closed

HomelessDinosaur wants to merge 35 commits into main from v1

.github/workflows/dotnet-test.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ jobs: @@
           - name: Setup .NET
             uses: actions/setup-dotnet@v1
             with:
-              dotnet-version: 6.0.x
+              dotnet-version: 7.0.x
           - name: Find and Replace Version templates
             run: |
               sed -i.bak 's/${VERSION}/0.0.1/g' src/Nitric.Sdk/Nitric.Sdk.csproj
@@ Expand Down @@

.github/workflows/draft-release.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,37 +4,37 @@ on:
  
      pull_request:

        types: [closed]

        branches:

          - 'main'

          - "main"

    jobs:

      version:

        if: github.event.pull_request.merged == true

        runs-on: ubuntu-latest

        steps:

        - name: Checkout

          uses: actions/checkout@v2

        - name: Setup Dotnet

          uses: actions/setup-dotnet@v1

          with:

            dotnet-version: 5.0.x

        - name: Git Identity

          run: |

            git config --global user.name 'github-actions[bot]'

            git config --global user.email 'github-actions[bot]@users.noreply.github.com'

        - name: Bump version and push tag

          id: tag_version

          uses: mathieudutour/[email protected]

          with:

            github_token: ${{ secrets.GITHUB_TOKEN }}

          - name: Checkout

            uses: actions/checkout@v2

          - name: Setup Dotnet

            uses: actions/setup-dotnet@v1

            with:

              dotnet-version: 7.0.x

          - name: Git Identity

            run: |

              git config --global user.name 'github-actions[bot]'

              git config --global user.email 'github-actions[bot]@users.noreply.github.com'

          - name: Bump version and push tag

            id: tag_version

            uses: mathieudutour/[email protected]

            with:

              github_token: ${{ secrets.GITHUB_TOKEN }}

        - name: Create Draft Release

          id: create_release

          uses: actions/create-release@v1

          env:

            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

          with:

            tag_name: ${{ steps.tag_version.outputs.new_tag }}

            release_name: Release ${{ steps.tag_version.outputs.new_tag }}

            body: See CHANGELOG.md for changes

            draft: true

            prerelease: false
      
          - name: Create Draft Release

            id: create_release

            uses: actions/create-release@v1

            env:

              GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

            with:

              tag_name: ${{ steps.tag_version.outputs.new_tag }}

              release_name: Release ${{ steps.tag_version.outputs.new_tag }}

              body: See CHANGELOG.md for changes

              draft: true

              prerelease: false

.github/workflows/publish-on-release.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ jobs: @@
             uses: actions/setup-dotnet@v1
             with:
               source-url: https://api.nuget.org/v3/index.json
-              dotnet-version: 5.0.x
+              dotnet-version: 7.0.x
             env:
               NUGET_AUTH_TOKEN: ${{ secrets.NUGET_TOKEN }}
           - name: Normalize version string
@@ Expand Down @@

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -330,4 +330,7 @@ ASALocalRun/ @@
     **/obj/
     **/bin/
     .idea
-    .vs
+    .vs
+    dotCover.*
+    __out/**
+    nitric/**/*.proto

makefile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,25 +1,37 @@
  
    .PHONY: test

    # the version of of https://github.com/nitrictech/nitric to use in base client generation.

    NITRIC_VERSION := 0.33.0

    NITRIC_VERSION := 1.17.0

    generate: clean download build

    test:

    	dotnet test tests/Nitric.Sdk.Test

    	@dotnet test test/Nitric.Sdk.Test

    build: 

    	dotnet build src/Nitric.Sdk/Nitric.Sdk.csproj

    	@dotnet build src/Nitric.Sdk/Nitric.Sdk.csproj

    	@mv src/Nitric.Sdk/Proto/nitric/proto/*  src/Nitric.Sdk/Proto/

    	@rm -rf nitric

    	@rm -rf src/Nitric.Sdk/Proto/nitric

    clean:

    	rm -rf src/Nitric.Sdk/bin

    	rm -rf src/Nitric.Sdk/obj

    	rm -rf src/Nitric.Sdk/Proto

    	@rm -rf src/Nitric.Sdk/bin

    	@rm -rf src/Nitric.Sdk/obj

    	@rm -rf src/Nitric.Sdk/Proto

    	@dotnet clean

    download:

    	curl -L https://github.com/nitrictech/nitric/releases/download/v${NITRIC_VERSION}/contracts.tgz -o contracts.tgz

    	tar xvzf contracts.tgz

    	rm contracts.tgz

    	@curl -L https://github.com/nitrictech/nitric/releases/download/v${NITRIC_VERSION}/proto.tgz -o nitric.tgz

    	@tar xvzf nitric.tgz

    	@rm nitric.tgz

    pack: clean download

    	dotnet build src/Nitric.Sdk/Nitric.Sdk.csproj -c Release

    	mkdir -p __out

    	dotnet pack -c Release -o __out
      
    	@dotnet build src/Nitric.Sdk/Nitric.Sdk.csproj -c Release

    	@mkdir -p __out

    	@dotnet pack -c Release -o __out

    coverage:

    	@echo "Using dotcover tool... Install using: 'dotnet tool install --global JetBrains.dotCover.GlobalTool'"

    	@rm -f coverage.xml dotCover.Output.html

    	@dotnet dotcover test --dcReportType=HTML --dcFilters="+:Nitric.Sdk;-:type=Nitric.Proto.*"

    	@open dotCover.Output.html

src/Nitric.Sdk/Common/Constants.cs

This file was deleted.

src/Nitric.Sdk/Common/Exceptions.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,7 @@ public NitricException(string message) : base(message) @@
             {
             }
-            internal static NitricException FromRpcException(RpcException exception)
+            public static NitricException FromRpcException(RpcException exception)
             {
                 return Exceptions.ContainsKey(exception.StatusCode)
                     ? Exceptions[exception.StatusCode](exception.Message)
@@ Expand Down @@

src/Nitric.Sdk/Common/Struct.cs

-Original file line number
+Diff line change
@@ -0,0 +1,48 @@
+    // Copyright 2021, Nitric Technologies Pty Ltd.
+    //
+    // Licensed under the Apache License, Version 2.0 (the "License");
+    // you may not use this file except in compliance with the License.
+    // You may obtain a copy of the License at
+    //
+    //      http://www.apache.org/licenses/LICENSE-2.0
+    //
+    // Unless required by applicable law or agreed to in writing, software
+    // distributed under the License is distributed on an "AS IS" BASIS,
+    // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    // See the License for the specific language governing permissions and
+    // limitations under the License.
+    using Google.Protobuf;
+    using Newtonsoft.Json;
+    using ProtoStruct = Google.Protobuf.WellKnownTypes.Struct;
+    namespace Nitric.Sdk.Common
+    {
+        public class Struct
+        {
+            public static T ToJsonSerializable<T>(ProtoStruct @struct)
+            {
+                T jsonSerializable = default;
+                if (@struct != null)
+                {
+                    JsonFormatter formatter = new JsonFormatter(JsonFormatter.Settings.Default);
+                    jsonSerializable = JsonConvert.DeserializeObject<T>(formatter.Format(@struct));
+                }
+                return jsonSerializable;
+            }
+            public static ProtoStruct FromJsonSerializable<T>(T jsonSerializable)
+            {
+                ProtoStruct structPayload = null;
+                if (jsonSerializable != null)
+                {
+                    var jsonPayload = JsonConvert.SerializeObject(jsonSerializable);
+                    structPayload = JsonParser.Default.Parse<ProtoStruct>(jsonPayload);
+                }
+                return structPayload;
+            }
+        }
+    }

src/Nitric.Sdk/Document/AbstractCollection.cs

This file was deleted.

src/Nitric.Sdk/Document/CollectionGroupRef.cs

This file was deleted.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

V1 #63

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!