Skip to content

Commit 9b3c8a6

Browse files
committed
check point
Signed-off-by: Shawn Hurley <shawn@hurley.page>
1 parent 488464f commit 9b3c8a6

4 files changed

Lines changed: 34 additions & 2 deletions

File tree

.github/workflows/demo-testing.yml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,17 @@ jobs:
9090
- provider: dotnet
9191
image_name: dotnet-provider
9292
dockerfile: external-providers/dotnet-external-provider/Dockerfile
93+
- provider: c-sharp
94+
image_name: c-sharp-provider
95+
dockerfile: Dockerfile
96+
repo: konveyor/c-sharp-analyzer-provider
9397
steps:
9498
- uses: actions/checkout@v3
9599

96100
- name: Build ${{ matrix.provider }} provider image
97101
uses: shawn-hurley/ci/build-image@main
98102
with:
99-
repo: konveyor/analyzer-lsp
103+
repo: ${{ matrix.repo || "konveyor/analyzer-lsp" }}
100104
checked_out: true
101105
image_name: ${{ matrix.image_name }}
102106
image_tag: ${{ needs.detect-changes.outputs.image_tag }}
@@ -120,8 +124,12 @@ jobs:
120124
artifact_pattern: "*({konveyor-analyzer-lsp,generic-provider,golang-dep-provider})"
121125
- provider: yaml
122126
artifact_pattern: "*(konveyor-analyzer-lsp|yq-provider)"
127+
- provider: c-sharp
128+
repo: "konveyor/c-sharp-analyzer-provider"
129+
artifact_pattern: "*(konveyor-analyzer|c-sharp-provider)"
123130
steps:
124131
- uses: actions/checkout@v3
132+
repo: ${{ matrix.repo || "konveyor/analyzer-lsp" }}
125133
if: needs.detect-changes.outputs[matrix.provider] == 'true'
126134

127135
- name: Download provider image artifacts
@@ -146,7 +154,25 @@ jobs:
146154
- name: Run provider-specific test
147155
if: needs.detect-changes.outputs[matrix.provider] == 'true'
148156
run: |
149-
make test-${{ matrix.provider }}
157+
podman volume create test-data
158+
podman run -rm -v test-data:/target:z -v $(PWD)/${{ matrix.test-data }}:z --entrypoint=cp alpine -a /src/. /target/
159+
podman pod create --name=analyzer-${{ matrix.provider }}
160+
podman run --pod analyzer-${{ matrix.provider }} -name ${{ matrix.provider }}-provider -d -v test-data:/analyzer-lsp/examples:z ..IMAGE --port 14651
161+
podman run --entrypoint /usr/local/bin/konveyor-analyzer --pod=analyzer-${{ matrix.provider }} \
162+
-v test-data:/analyzer-lsp/examples:z \
163+
-v ${{ matrix.demo-output-path }}:/analyzer-lsp/output.yaml:z \
164+
-v ${{ matrix.provider_settings-path }}:/analyzer-lsp/provider_settings.json:z \
165+
-v ${{ matrix.testing-rules }}:/analyzer-lsp/rules:z \
166+
...IMAGE
167+
--output=/analzyer-lsp/output.yaml \
168+
--rules=/analyzer-lsp/rules \
169+
--provider-settings=/analyzer-lsp/provider_settings.json
170+
171+
- name: Run e2e verification
172+
if: needs.detect-changes.outputs[matrix.provider] == 'true'
173+
shell: bash
174+
run: |
175+
git diff --exit-code HEAD -- ${{ matrix.demo-output-path }}
150176
151177
152178
test:

provider/grpc/provider.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,12 @@ func (g *grpcProvider) Init(ctx context.Context, log logr.Logger, config provide
227227
id: r.Id,
228228
config: config,
229229
client: g.Client,
230+
log: log.WithName("grpcServiceClient"),
230231
}, additionalBuiltinConfig, nil
231232
}
232233

233234
func (g *grpcProvider) Evaluate(ctx context.Context, cap string, conditionInfo []byte) (provider.ProviderEvaluateResponse, error) {
235+
g.log.Info("connection", "conn", g.conn.GetState())
234236
return provider.FullResponseFromServiceClients(ctx, g.serviceClients, cap, conditionInfo)
235237
}
236238

provider/grpc/service_client.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"fmt"
66

7+
"github.com/go-logr/logr"
78
"github.com/konveyor/analyzer-lsp/provider"
89
pb "github.com/konveyor/analyzer-lsp/provider/internal/grpc"
910
"go.lsp.dev/uri"
@@ -13,6 +14,7 @@ type grpcServiceClient struct {
1314
id int64
1415
config provider.InitConfig
1516
client pb.ProviderServiceClient
17+
log logr.Logger
1618
}
1719

1820
var _ provider.ServiceClient = &grpcServiceClient{}
@@ -25,6 +27,7 @@ func (g *grpcServiceClient) Evaluate(ctx context.Context, cap string, conditionI
2527
}
2628

2729
r, err := g.client.Evaluate(ctx, &m)
30+
g.log.Info("Made call to Evaluate", "err", err)
2831
if err != nil {
2932
return provider.ProviderEvaluateResponse{}, err
3033
}

provider/provider.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,7 @@ func (p ProviderCondition) Evaluate(ctx context.Context, log logr.Logger, condCt
551551
span.SetAttributes(attribute.Key("condition").String(string(templatedInfo)))
552552
resp, err := p.Client.Evaluate(ctx, p.Capability, templatedInfo)
553553
if err != nil {
554+
log.Error(err, "unable to make evaluate call", "cap", p.Capability)
554555
// If an error always just return the empty
555556
return engine.ConditionResponse{}, err
556557
}

0 commit comments

Comments
 (0)