Skip to content

Commit faa990f

Browse files
shawn-hurleyshawn-hurley
committed
renaming konveyor to core
Signed-off-by: Shawn Hurley <shawn@hurley.page>
1 parent 10bf4cc commit faa990f

19 files changed

Lines changed: 137 additions & 136 deletions

‎.github/workflows/demo-testing.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,8 @@ jobs:
293293
294294
# run the demo in a podman pod
295295
- name: run demo image
296+
env:
297+
MOUNT_OPT=:U,Z
296298
run : |
297299
make run-external-providers-pod
298300
make run-demo-image

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ COPY parser /analyzer-lsp/parser
1313
COPY provider /analyzer-lsp/provider
1414
COPY progress /analyzer-lsp/progress
1515
COPY tracing /analyzer-lsp/tracing
16-
COPY konveyor /analyzer-lsp/konveyor
16+
COPY core /analyzer-lsp/core
1717
COPY go.mod /analyzer-lsp/go.mod
1818
COPY go.sum /analyzer-lsp/go.sum
1919
COPY Makefile /analyzer-lsp/Makefile

‎Makefile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ stop-external-providers:
8383
run-external-providers-pod:
8484
podman volume create test-data
8585
# copy data to test data volume
86-
podman run --rm -v test-data:/target$(MOUNT_OPT) -v $(PWD)/examples:/src/$(MOUNT_OPT) --entrypoint=cp alpine -a /src/. /target/
87-
podman run --rm -v test-data:/target$(MOUNT_OPT) -v $(PWD)/external-providers/java-external-provider/examples:/src/$(MOUNT_OPT) --entrypoint=cp alpine -a /src/. /target/
86+
podman run --rm --user=$(USER_ID) -v test-data:/target$(MOUNT_OPT) -v $(PWD)/examples:/src/$(MOUNT_OPT) --entrypoint=cp alpine -a /src/. /target/
87+
podman run --rm --user=$(USER_ID) -v test-data:/target$(MOUNT_OPT) -v $(PWD)/external-providers/java-external-provider/examples:/src/$(MOUNT_OPT) --entrypoint=cp alpine -a /src/. /target/
8888
# run pods w/ defined ports for the test volumes
8989
podman pod create --name=analyzer --userns=keep-id
9090
podman run --pod analyzer --user=$(USER_ID) --name java-provider -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) $(IMG_JAVA_PROVIDER) --port 14651
@@ -100,7 +100,7 @@ run-demo-image:
100100
# Provider-specific test targets
101101
run-java-provider-pod:
102102
podman volume create test-data
103-
podman run --rm -v test-data:/target$(MOUNT_OPT) -v $(PWD)/external-providers/java-external-provider/examples:/src/$(MOUNT_OPT) --entrypoint=cp alpine -a /src/. /target/
103+
podman run --rm --user=$(USER_ID) -v test-data:/target$(MOUNT_OPT) -v $(PWD)/external-providers/java-external-provider/examples:/src/$(MOUNT_OPT) --entrypoint=cp alpine -a /src/. /target/
104104
podman pod create --name=analyzer-java --userns=keep-id
105105
podman run --pod analyzer-java --user=$(USER_ID) --name java-provider -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) $(IMG_JAVA_PROVIDER) --port 14651
106106

@@ -123,17 +123,17 @@ stop-java-provider-pod:
123123

124124
run-generic-golang-provider-pod:
125125
podman volume create test-data
126-
podman run --rm -v test-data:/target$(MOUNT_OPT) -v $(PWD)/examples:/src/$(MOUNT_OPT) --entrypoint=cp alpine -a /src/. /target/
126+
podman run --rm --user=$(USER_ID) -v test-data:/target$(MOUNT_OPT) -v $(PWD)/examples:/src/$(MOUNT_OPT) --entrypoint=cp alpine -a /src/. /target/
127127
podman pod create --name=analyzer-generic-golang --userns=keep-id
128128
podman run --pod analyzer-generic-golang --user=$(USER_ID) --name golang -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) $(IMG_GENERIC_PROVIDER) --port 14651 --name generic
129129
run-generic-python-provider-pod:
130130
podman volume create test-data
131-
podman run --rm -v test-data:/target$(MOUNT_OPT) -v $(PWD)/examples:/src/$(MOUNT_OPT) --entrypoint=cp alpine -a /src/. /target/
131+
podman run --rm --user=$(USER_ID) -v test-data:/target$(MOUNT_OPT) -v $(PWD)/examples:/src/$(MOUNT_OPT) --entrypoint=cp alpine -a /src/. /target/
132132
podman pod create --name=analyzer-generic-python --userns=keep-id
133133
podman run --pod analyzer-generic-python --user=$(USER_ID) --name python -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) $(IMG_GENERIC_PROVIDER) --port 14651 --name pylsp
134134
run-generic-nodejs-provider-pod:
135135
podman volume create test-data
136-
podman run --rm -v test-data:/target$(MOUNT_OPT) -v $(PWD)/examples:/src/$(MOUNT_OPT) --entrypoint=cp alpine -a /src/. /target/
136+
podman run --rm --user=$(USER_ID) -v test-data:/target$(MOUNT_OPT) -v $(PWD)/examples:/src/$(MOUNT_OPT) --entrypoint=cp alpine -a /src/. /target/
137137
podman pod create --name=analyzer-generic-nodejs --userns=keep-id
138138
podman run --pod analyzer-generic-nodejs --user=$(USER_ID) --name nodejs -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) $(IMG_GENERIC_PROVIDER) --port 14651 --name nodejs
139139

@@ -188,7 +188,7 @@ stop-generic-nodejs-provider-pod:
188188

189189
run-yaml-provider-pod:
190190
podman volume create test-data
191-
podman run --rm -v test-data:/target$(MOUNT_OPT) -v $(PWD)/examples:/src/$(MOUNT_OPT) --entrypoint=cp alpine -a /src/. /target/
191+
podman run --rm --user=$(USER_ID) -v test-data:/target$(MOUNT_OPT) -v $(PWD)/examples:/src/$(MOUNT_OPT) --entrypoint=cp alpine -a /src/. /target/
192192
podman pod create --name=analyzer-yaml --userns=keep-id
193193
podman run --pod analyzer-yaml --user=$(USER_ID) --name yq -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) $(IMG_YQ_PROVIDER) --port 14651
194194

‎cmd/analyzer/main.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
logrusr "github.com/bombsimon/logrusr/v3"
1212
"github.com/go-logr/logr"
13-
"github.com/konveyor/analyzer-lsp/konveyor"
13+
"github.com/konveyor/analyzer-lsp/core"
1414
"github.com/konveyor/analyzer-lsp/parser"
1515
"github.com/konveyor/analyzer-lsp/progress"
1616
"github.com/konveyor/analyzer-lsp/progress/collector"
@@ -28,7 +28,7 @@ const (
2828

2929
var (
3030
// AnalyzerConfig holds the analyzer configuration
31-
analyzerConfig = &konveyor.AnalyzerConfig{}
31+
analyzerConfig = &core.AnalyzerConfig{}
3232

3333
// Additional CLI-specific flags
3434
outputViolations string
@@ -96,12 +96,12 @@ func AnalysisCmd() *cobra.Command {
9696
// Build options from config and add CLI-specific options
9797
options := analyzerConfig.ToOptions()
9898
options = append(options,
99-
konveyor.WithLogger(log),
100-
konveyor.WithContext(ctx),
101-
konveyor.WithProgress(analyzerProgress),
99+
core.WithLogger(log),
100+
core.WithContext(ctx),
101+
core.WithProgress(analyzerProgress),
102102
)
103103

104-
analyzer, err := konveyor.NewAnalyzer(options...)
104+
analyzer, err := core.NewAnalyzer(options...)
105105

106106
if err != nil {
107107
errLog.Error(err, "Unable to create new Analyzer")

konveyor/analyzer.go renamed to core/analyzer.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package konveyor
1+
package core
22

33
import (
44
"context"
@@ -14,7 +14,6 @@ import (
1414
"github.com/go-logr/logr"
1515
"github.com/konveyor/analyzer-lsp/engine"
1616
"github.com/konveyor/analyzer-lsp/engine/labels"
17-
"github.com/konveyor/analyzer-lsp/output/v1/konveyor"
1817
v1 "github.com/konveyor/analyzer-lsp/output/v1/konveyor"
1918
"github.com/konveyor/analyzer-lsp/parser"
2019
"github.com/konveyor/analyzer-lsp/progress"
@@ -391,7 +390,7 @@ func (a *analyzer) GetDependencies(outputFilePath string, tree bool) error {
391390
continue
392391
}
393392
for u, ds := range deps {
394-
depsTree = append(depsTree, konveyor.DepsTreeItem{
393+
depsTree = append(depsTree, v1.DepsTreeItem{
395394
FileURI: string(u),
396395
Provider: prov.Name,
397396
Dependencies: ds,
@@ -405,7 +404,7 @@ func (a *analyzer) GetDependencies(outputFilePath string, tree bool) error {
405404
}
406405
for u, ds := range deps {
407406
newDeps := ds
408-
depsFlat = append(depsFlat, konveyor.DepsFlatItem{
407+
depsFlat = append(depsFlat, v1.DepsFlatItem{
409408
Provider: prov.Name,
410409
FileURI: string(u),
411410
Dependencies: newDeps,

konveyor/analyzer_test.go renamed to core/analyzer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package konveyor
1+
package core
22

33
import (
44
"testing"

konveyor/config.go renamed to core/config.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package konveyor
1+
package core
22

33
import (
44
"github.com/spf13/cobra"
@@ -10,11 +10,11 @@ import (
1010
//
1111
// Example usage with cobra:
1212
//
13-
// config := &konveyor.AnalyzerConfig{}
13+
// config := &core.AnalyzerConfig{}
1414
// cmd := &cobra.Command{
1515
// Use: "analyze",
1616
// Run: func(cmd *cobra.Command, args []string) {
17-
// analyzer, err := konveyor.NewAnalyzer(config.ToOptions()...)
17+
// analyzer, err := core.NewAnalyzer(config.ToOptions()...)
1818
// if err != nil {
1919
// log.Fatal(err)
2020
// }
@@ -71,7 +71,7 @@ type AnalyzerConfig struct {
7171
//
7272
// Example:
7373
//
74-
// config := &konveyor.AnalyzerConfig{}
74+
// config := &core.AnalyzerConfig{}
7575
// rootCmd := &cobra.Command{Use: "analyzer"}
7676
// config.AddFlags(rootCmd)
7777
func (c *AnalyzerConfig) AddFlags(cmd *cobra.Command) {
@@ -94,12 +94,12 @@ func (c *AnalyzerConfig) AddFlags(cmd *cobra.Command) {
9494
//
9595
// Example:
9696
//
97-
// config := &konveyor.AnalyzerConfig{
97+
// config := &core.AnalyzerConfig{
9898
// ProviderSettings: "provider_settings.json",
9999
// Rules: []string{"rules/"},
100100
// IncidentLimit: 1500,
101101
// }
102-
// analyzer, err := konveyor.NewAnalyzer(config.ToOptions()...)
102+
// analyzer, err := core.NewAnalyzer(config.ToOptions()...)
103103
// if err != nil {
104104
// // Handle validation errors from option functions
105105
// log.Fatal(err)

konveyor/config_test.go renamed to core/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package konveyor
1+
package core
22

33
import (
44
"testing"

konveyor/options.go renamed to core/options.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Package konveyor provides an analyzer interface for static code analysis.
1+
// Package core provides an analyzer interface for static code analysis.
22
//
33
// # Option Validation
44
//
@@ -19,7 +19,7 @@
1919
//
2020
// All validation errors are collected and returned by NewAnalyzer if any
2121
// option fails validation.
22-
package konveyor
22+
package core
2323

2424
import (
2525
"context"

konveyor/options_test.go renamed to core/options_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package konveyor
1+
package core
22

33
import (
44
"context"

0 commit comments

Comments
 (0)