Skip to content
This repository was archived by the owner on Oct 14, 2024. It is now read-only.

Commit

Permalink
refactor(orchestrator): remove pkg folder from orchestrator and provi…
Browse files Browse the repository at this point in the history 
…der modules
  • Loading branch information
@paralta
paralta committed Feb 6, 2024
1 parent 6629e3a commit b4e9e13
Show file tree
Hide file tree
Showing 109 changed files with 79 additions and 79 deletions.
2 changes: 1 addition & 1 deletion orchestrator/cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"

orchestrator "github.com/openclarity/vmclarity/orchestrator/pkg"
"github.com/openclarity/vmclarity/orchestrator"
"github.com/openclarity/vmclarity/utils/log"
"github.com/openclarity/vmclarity/utils/version"
)
Expand Down
0 orchestrator/pkg/common/event.go → orchestrator/common/event.go
View file
File renamed without changes.
0 orchestrator/pkg/common/poller.go → orchestrator/common/poller.go
View file
File renamed without changes.
0 orchestrator/pkg/common/queue.go → orchestrator/common/queue.go
View file
File renamed without changes.
0 orchestrator/pkg/common/queue_test.go → orchestrator/common/queue_test.go
View file
File renamed without changes.
0 orchestrator/pkg/common/reconciler.go → orchestrator/common/reconciler.go
View file
File renamed without changes.
14 changes: 7 additions & 7 deletions orchestrator/pkg/config.go → orchestrator/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ import (
"github.com/spf13/viper"

"github.com/openclarity/vmclarity/api/types"
discovery "github.com/openclarity/vmclarity/orchestrator/pkg/discoverer"
assetscanprocessor "github.com/openclarity/vmclarity/orchestrator/pkg/processor/assetscan"
assetscanwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/assetscan"
assetscanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/assetscanestimation"
scanwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scan"
scanconfigwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scanconfig"
scanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scanestimation"
discovery "github.com/openclarity/vmclarity/orchestrator/discoverer"
assetscanprocessor "github.com/openclarity/vmclarity/orchestrator/processor/assetscan"
assetscanwatcher "github.com/openclarity/vmclarity/orchestrator/watcher/assetscan"
assetscanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/watcher/assetscanestimation"
scanwatcher "github.com/openclarity/vmclarity/orchestrator/watcher/scan"
scanconfigwatcher "github.com/openclarity/vmclarity/orchestrator/watcher/scanconfig"
scanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/watcher/scanestimation"
)

const (
Expand Down
14 changes: 7 additions & 7 deletions orchestrator/pkg/config_test.go → orchestrator/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ import (

apitypes "github.com/openclarity/vmclarity/api/types"

"github.com/openclarity/vmclarity/orchestrator/pkg/discoverer"
assetscanprocessor "github.com/openclarity/vmclarity/orchestrator/pkg/processor/assetscan"
assetscanwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/assetscan"
assetscanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/assetscanestimation"
scanwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scan"
scanconfigwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scanconfig"
scanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scanestimation"
"github.com/openclarity/vmclarity/orchestrator/discoverer"
assetscanprocessor "github.com/openclarity/vmclarity/orchestrator/processor/assetscan"
assetscanwatcher "github.com/openclarity/vmclarity/orchestrator/watcher/assetscan"
assetscanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/watcher/assetscanestimation"
scanwatcher "github.com/openclarity/vmclarity/orchestrator/watcher/scan"
scanconfigwatcher "github.com/openclarity/vmclarity/orchestrator/watcher/scanconfig"
scanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/watcher/scanestimation"
)

func TestUnmarshalCloudProvider(t *testing.T) {
Expand Down
0 orchestrator/pkg/controller.go → orchestrator/controller.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion orchestrator/pkg/discoverer/config.go → orchestrator/discoverer/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"time"

"github.com/openclarity/vmclarity/api/client"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion orchestrator/pkg/discoverer/discoverer.go → orchestrator/discoverer/discoverer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/openclarity/vmclarity/api/client"
"github.com/openclarity/vmclarity/api/types"
"github.com/openclarity/vmclarity/cli/pkg/utils"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
)

const (
Expand Down
28 changes: 14 additions & 14 deletions orchestrator/pkg/orchestrator.go → orchestrator/orchestrator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@ import (

"github.com/openclarity/vmclarity/api/client"
"github.com/openclarity/vmclarity/api/types"
discovery "github.com/openclarity/vmclarity/orchestrator/pkg/discoverer"
assetscanprocessor "github.com/openclarity/vmclarity/orchestrator/pkg/processor/assetscan"
assetscanwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/assetscan"
assetscanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/assetscanestimation"
scanwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scan"
scanconfigwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scanconfig"
scanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/pkg/watcher/scanestimation"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider/pkg/aws"
"github.com/openclarity/vmclarity/provider/pkg/azure"
"github.com/openclarity/vmclarity/provider/pkg/docker"
"github.com/openclarity/vmclarity/provider/pkg/external"
"github.com/openclarity/vmclarity/provider/pkg/gcp"
"github.com/openclarity/vmclarity/provider/pkg/kubernetes"
discovery "github.com/openclarity/vmclarity/orchestrator/discoverer"
assetscanprocessor "github.com/openclarity/vmclarity/orchestrator/processor/assetscan"
assetscanwatcher "github.com/openclarity/vmclarity/orchestrator/watcher/assetscan"
assetscanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/watcher/assetscanestimation"
scanwatcher "github.com/openclarity/vmclarity/orchestrator/watcher/scan"
scanconfigwatcher "github.com/openclarity/vmclarity/orchestrator/watcher/scanconfig"
scanestimationwatcher "github.com/openclarity/vmclarity/orchestrator/watcher/scanestimation"
"github.com/openclarity/vmclarity/provider"
"github.com/openclarity/vmclarity/provider/aws"
"github.com/openclarity/vmclarity/provider/azure"
"github.com/openclarity/vmclarity/provider/docker"
"github.com/openclarity/vmclarity/provider/external"
"github.com/openclarity/vmclarity/provider/gcp"
"github.com/openclarity/vmclarity/provider/kubernetes"
"github.com/openclarity/vmclarity/utils/log"
)

Expand Down
0 ...strator/pkg/processor/assetscan/common.go → orchestrator/processor/assetscan/common.go
View file
File renamed without changes.
0 ...strator/pkg/processor/assetscan/config.go → orchestrator/processor/assetscan/config.go
View file
File renamed without changes.
0 ...rator/pkg/processor/assetscan/exploits.go → orchestrator/processor/assetscan/exploits.go
View file
File renamed without changes.
0 ...tor/pkg/processor/assetscan/infofinder.go → ...strator/processor/assetscan/infofinder.go
View file
File renamed without changes.
0 ...trator/pkg/processor/assetscan/malware.go → orchestrator/processor/assetscan/malware.go
View file
File renamed without changes.
0 .../processor/assetscan/misconfigurations.go → .../processor/assetscan/misconfigurations.go
View file
File renamed without changes.
0 ...rator/pkg/processor/assetscan/packages.go → orchestrator/processor/assetscan/packages.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ator/pkg/processor/assetscan/processor.go → ...estrator/processor/assetscan/processor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/openclarity/vmclarity/api/client"
"github.com/openclarity/vmclarity/api/types"
"github.com/openclarity/vmclarity/cli/pkg/utils"
"github.com/openclarity/vmclarity/orchestrator/pkg/common"
"github.com/openclarity/vmclarity/orchestrator/common"
"github.com/openclarity/vmclarity/utils/log"
)

Expand Down
0 ...rator/pkg/processor/assetscan/rootkits.go → orchestrator/processor/assetscan/rootkits.go
View file
File renamed without changes.
0 ...trator/pkg/processor/assetscan/secrets.go → orchestrator/processor/assetscan/secrets.go
View file
File renamed without changes.
0 ...kg/processor/assetscan/vulnerabilities.go → ...or/processor/assetscan/vulnerabilities.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion orchestrator/pkg/watcher/assetscan/config.go → orchestrator/watcher/assetscan/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"time"

"github.com/openclarity/vmclarity/api/client"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
)

const (
Expand Down
0 ...kg/watcher/assetscan/delete_job_policy.go → ...or/watcher/assetscan/delete_job_policy.go
View file
File renamed without changes.
0 ...tcher/assetscan/delete_job_policy_test.go → ...tcher/assetscan/delete_job_policy_test.go
View file
File renamed without changes.
0 orchestrator/pkg/watcher/assetscan/event.go → orchestrator/watcher/assetscan/event.go
View file
File renamed without changes.
0 ...strator/pkg/watcher/assetscan/families.go → orchestrator/watcher/assetscan/families.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...estrator/pkg/watcher/assetscan/helpers.go → orchestrator/watcher/assetscan/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/openclarity/vmclarity/api/types"
"github.com/openclarity/vmclarity/cli/pkg/utils"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
)

type jobConfigInput struct {
Expand Down
0 ...or/pkg/watcher/assetscan/scannerconfig.go → ...trator/watcher/assetscan/scannerconfig.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...estrator/pkg/watcher/assetscan/watcher.go → orchestrator/watcher/assetscan/watcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"github.com/openclarity/vmclarity/api/client"
"github.com/openclarity/vmclarity/api/types"
"github.com/openclarity/vmclarity/cli/pkg/utils"
"github.com/openclarity/vmclarity/orchestrator/pkg/common"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/orchestrator/common"
"github.com/openclarity/vmclarity/provider"
"github.com/openclarity/vmclarity/utils/log"
)

Expand Down
2 changes: 1 addition & 1 deletion ...pkg/watcher/assetscanestimation/config.go → ...tor/watcher/assetscanestimation/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"time"

"github.com/openclarity/vmclarity/api/client"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
)

const (
Expand Down
0 .../pkg/watcher/assetscanestimation/event.go → ...ator/watcher/assetscanestimation/event.go
View file
File renamed without changes.
0 ...kg/watcher/assetscanestimation/helpers.go → ...or/watcher/assetscanestimation/helpers.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...kg/watcher/assetscanestimation/watcher.go → ...or/watcher/assetscanestimation/watcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"github.com/openclarity/vmclarity/api/client"
"github.com/openclarity/vmclarity/api/types"
"github.com/openclarity/vmclarity/cli/pkg/utils"
"github.com/openclarity/vmclarity/orchestrator/pkg/common"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/orchestrator/common"
"github.com/openclarity/vmclarity/provider"
"github.com/openclarity/vmclarity/utils/log"
)

Expand Down
2 changes: 1 addition & 1 deletion orchestrator/pkg/watcher/scan/config.go → orchestrator/watcher/scan/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"time"

"github.com/openclarity/vmclarity/api/client"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
)

const (
Expand Down
0 orchestrator/pkg/watcher/scan/event.go → orchestrator/watcher/scan/event.go
View file
File renamed without changes.
0 orchestrator/pkg/watcher/scan/helpers.go → orchestrator/watcher/scan/helpers.go
View file
File renamed without changes.
0 ...estrator/pkg/watcher/scan/helpers_test.go → orchestrator/watcher/scan/helpers_test.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions orchestrator/pkg/watcher/scan/watcher.go → orchestrator/watcher/scan/watcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/openclarity/vmclarity/api/client"
"github.com/openclarity/vmclarity/api/types"
"github.com/openclarity/vmclarity/cli/pkg/utils"
"github.com/openclarity/vmclarity/orchestrator/pkg/common"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/orchestrator/common"
"github.com/openclarity/vmclarity/provider"
"github.com/openclarity/vmclarity/utils/log"
)

Expand Down
0 ...estrator/pkg/watcher/scanconfig/config.go → orchestrator/watcher/scanconfig/config.go
View file
File renamed without changes.
0 orchestrator/pkg/watcher/scanconfig/event.go → orchestrator/watcher/scanconfig/event.go
View file
File renamed without changes.
0 ...strator/pkg/watcher/scanconfig/helpers.go → orchestrator/watcher/scanconfig/helpers.go
View file
File renamed without changes.
0 ...trator/pkg/watcher/scanconfig/schedule.go → orchestrator/watcher/scanconfig/schedule.go
View file
File renamed without changes.
0 ...r/pkg/watcher/scanconfig/schedule_test.go → ...rator/watcher/scanconfig/schedule_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...strator/pkg/watcher/scanconfig/watcher.go → orchestrator/watcher/scanconfig/watcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/openclarity/vmclarity/api/client"
"github.com/openclarity/vmclarity/api/types"
"github.com/openclarity/vmclarity/cli/pkg/utils"
"github.com/openclarity/vmclarity/orchestrator/pkg/common"
"github.com/openclarity/vmclarity/orchestrator/common"
"github.com/openclarity/vmclarity/utils/log"
)

Expand Down
2 changes: 1 addition & 1 deletion ...ator/pkg/watcher/scanestimation/config.go → ...estrator/watcher/scanestimation/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"time"

"github.com/openclarity/vmclarity/api/client"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
)

const (
Expand Down
0 ...rator/pkg/watcher/scanestimation/event.go → orchestrator/watcher/scanestimation/event.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...tor/pkg/watcher/scanestimation/watcher.go → ...strator/watcher/scanestimation/watcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"github.com/openclarity/vmclarity/api/client"
"github.com/openclarity/vmclarity/api/types"
"github.com/openclarity/vmclarity/cli/pkg/utils"
"github.com/openclarity/vmclarity/orchestrator/pkg/common"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/orchestrator/common"
"github.com/openclarity/vmclarity/provider"
"github.com/openclarity/vmclarity/utils/log"
)

Expand Down
0 ...kg/watcher/scanestimation/watcher_test.go → ...or/watcher/scanestimation/watcher_test.go
View file
File renamed without changes.
0 provider/pkg/aws/config.go → provider/aws/config.go
View file
File renamed without changes.
0 provider/pkg/aws/config_test.go → provider/aws/config_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion provider/pkg/aws/errors.go → provider/aws/errors.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/aws/smithy-go"

provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion provider/pkg/aws/helpers.go → provider/aws/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"github.com/openclarity/vmclarity/api/types"
"github.com/openclarity/vmclarity/cli/pkg/utils"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
)

func EC2TagsFromScanMetadata(meta provider.ScanMetadata) []ec2types.Tag {
Expand Down
2 changes: 1 addition & 1 deletion provider/pkg/aws/instance.go → provider/aws/instance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

"github.com/openclarity/vmclarity/api/types"
"github.com/openclarity/vmclarity/cli/pkg/utils"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
"github.com/openclarity/vmclarity/utils/log"
)

Expand Down
0 provider/pkg/aws/location.go → provider/aws/location.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions provider/pkg/aws/provider.go → provider/aws/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import (

"github.com/openclarity/vmclarity/api/types"
"github.com/openclarity/vmclarity/cli/pkg/utils"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider/pkg/aws/scanestimation"
"github.com/openclarity/vmclarity/provider/pkg/cloudinit"
"github.com/openclarity/vmclarity/provider"
"github.com/openclarity/vmclarity/provider/aws/scanestimation"
"github.com/openclarity/vmclarity/provider/cloudinit"
"github.com/openclarity/vmclarity/utils/log"
)

Expand Down
0 provider/pkg/aws/provider_test.go → provider/aws/provider_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion provider/pkg/aws/scanestimation/estimate.go → provider/aws/scanestimation/estimate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/openclarity/vmclarity/api/types"
familiestypes "github.com/openclarity/vmclarity/cli/pkg/families/types"
"github.com/openclarity/vmclarity/cli/pkg/utils"
"github.com/openclarity/vmclarity/provider/pkg/common"
"github.com/openclarity/vmclarity/provider/common"
)

type MarketOption string
Expand Down
0 ...r/pkg/aws/scanestimation/estimate_test.go → provider/aws/scanestimation/estimate_test.go
View file
File renamed without changes.
0 ...er/pkg/aws/scanestimation/pricefetcher.go → provider/aws/scanestimation/pricefetcher.go
View file
File renamed without changes.
0 ...g/aws/scanestimation/pricefetcher_test.go → ...r/aws/scanestimation/pricefetcher_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion provider/pkg/aws/snapshot.go → provider/aws/snapshot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/sirupsen/logrus"

"github.com/openclarity/vmclarity/cli/pkg/utils"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
"github.com/openclarity/vmclarity/utils/log"
)

Expand Down
0 provider/pkg/aws/types.go → provider/aws/types.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion provider/pkg/aws/volume.go → provider/aws/volume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/sirupsen/logrus"

"github.com/openclarity/vmclarity/cli/pkg/utils"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
"github.com/openclarity/vmclarity/utils/log"
)

Expand Down
2 changes: 1 addition & 1 deletion provider/pkg/azure/blob.go → provider/azure/blob.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4"
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob"

provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion provider/pkg/azure/common.go → provider/azure/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/Azure/azure-sdk-for-go/sdk/azcore"

provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
)

func handleAzureRequestError(err error, actionTmpl string, parts ...interface{}) (bool, error) {
Expand Down
0 provider/pkg/azure/config.go → provider/azure/config.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion provider/pkg/azure/networkInterface.go → provider/azure/networkInterface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v3"

provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion provider/pkg/azure/provider.go → provider/azure/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

"github.com/openclarity/vmclarity/api/types"
"github.com/openclarity/vmclarity/cli/pkg/utils"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
"github.com/openclarity/vmclarity/utils/log"
)

Expand Down
0 provider/pkg/azure/provider_test.go → provider/azure/provider_test.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions provider/pkg/azure/scannerVm.go → provider/azure/scannerVm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v3"

"github.com/openclarity/vmclarity/cli/pkg/utils"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider/pkg/cloudinit"
"github.com/openclarity/vmclarity/provider"
"github.com/openclarity/vmclarity/provider/cloudinit"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion provider/pkg/azure/snapshot.go → provider/azure/snapshot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4"

provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion provider/pkg/azure/targetDisk.go → provider/azure/targetDisk.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4"

provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
)

var (
Expand Down
0 provider/pkg/azure/types.go → provider/azure/types.go
View file
File renamed without changes.
0 provider/pkg/cloudinit/cloud-init.tmpl.yaml → provider/cloudinit/cloud-init.tmpl.yaml
View file
File renamed without changes.
0 provider/pkg/cloudinit/cloudinit.go → provider/cloudinit/cloudinit.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion provider/pkg/cloudinit/cloudinit_test.go → provider/cloudinit/cloudinit_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

. "github.com/onsi/gomega"

provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
)

//go:embed testdata/cloud-init.yaml
Expand Down
0 ...er/pkg/cloudinit/testdata/cloud-init.yaml → provider/cloudinit/testdata/cloud-init.yaml
View file
File renamed without changes.
0 ...loudinit/testdata/scanner-cli-config.yaml → ...loudinit/testdata/scanner-cli-config.yaml
View file
File renamed without changes.
0 provider/pkg/common/utils.go → provider/common/utils.go
View file
File renamed without changes.
0 provider/pkg/docker/config.go → provider/docker/config.go
View file
File renamed without changes.
0 provider/pkg/docker/container.go → provider/docker/container.go
View file
File renamed without changes.
0 provider/pkg/docker/image.go → provider/docker/image.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion provider/pkg/docker/provider.go → provider/docker/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (

apitypes "github.com/openclarity/vmclarity/api/types"
"github.com/openclarity/vmclarity/cli/pkg/families"
provider "github.com/openclarity/vmclarity/provider/pkg"
"github.com/openclarity/vmclarity/provider"
"github.com/openclarity/vmclarity/utils/log"
)

Expand Down
0 provider/pkg/errors.go → provider/errors.go
View file
File renamed without changes.
0 provider/pkg/errors_test.go → provider/errors_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion provider/examples/external/plugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"google.golang.org/grpc"
"google.golang.org/protobuf/types/known/timestamppb"

provider_service "github.com/openclarity/vmclarity/provider/pkg/external/proto"
provider_service "github.com/openclarity/vmclarity/provider/external/proto"
)

type Provider struct {
Expand Down
0 provider/pkg/external/config.go → provider/external/config.go
View file
File renamed without changes.
0 provider/pkg/external/gen.go → provider/external/gen.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions provider/pkg/external/helpers.go → provider/external/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

"github.com/openclarity/vmclarity/api/types"
"github.com/openclarity/vmclarity/cli/pkg/utils"
provider "github.com/openclarity/vmclarity/provider/pkg"
provider_service "github.com/openclarity/vmclarity/provider/pkg/external/proto"
"github.com/openclarity/vmclarity/provider"
provider_service "github.com/openclarity/vmclarity/provider/external/proto"
)

func convertAssetToModels(asset *provider_service.Asset) (types.Asset, error) {
Expand Down
4 changes: 2 additions & 2 deletions provider/pkg/external/helpers_test.go → provider/external/helpers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (

"github.com/openclarity/vmclarity/api/types"
"github.com/openclarity/vmclarity/cli/pkg/utils"
provider "github.com/openclarity/vmclarity/provider/pkg"
provider_service "github.com/openclarity/vmclarity/provider/pkg/external/proto"
"github.com/openclarity/vmclarity/provider"
provider_service "github.com/openclarity/vmclarity/provider/external/proto"
)

func Test_convertAssetToModels(t *testing.T) {
Expand Down
0 ...pkg/external/proto/provider_service.pb.go → ...der/external/proto/provider_service.pb.go
View file
File renamed without changes.
0 ...pkg/external/proto/provider_service.proto → ...der/external/proto/provider_service.proto
View file
File renamed without changes.
0 ...xternal/proto/provider_service_grpc.pb.go → ...xternal/proto/provider_service_grpc.pb.go
View file
File renamed without changes.
Loading

0 comments on commit b4e9e13

Please sign in to comment.