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

Commit

Permalink
Move runtime_scan package to pkg/orchestrator
Browse files Browse the repository at this point in the history 
This is the forth commit in the chain for reorganising under a common
cmd and pkg directory structure. This commit moves runtime_scan/pkg
package into pkg/orchestrator. Its is renamed to orchestrator in
preparation for the microservices split, instead of having to go through
a second rename.
  • Loading branch information
@Tehsmash
Tehsmash committed Jul 24, 2023
1 parent a1b246b commit 5acc3b6
Show file tree
Hide file tree
Showing 87 changed files with 56 additions and 273 deletions.
2 changes: 1 addition & 1 deletion example_external_provider_plugin/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/runtime_scan/pkg/provider/external/proto"
provider_service "github.com/openclarity/vmclarity/pkg/orchestrator/provider/external/proto"
)

type Provider struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/backend/backend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
"github.com/openclarity/vmclarity/pkg/backend/database"
databaseTypes "github.com/openclarity/vmclarity/pkg/backend/database/types"
"github.com/openclarity/vmclarity/pkg/backend/rest"
"github.com/openclarity/vmclarity/pkg/orchestrator"
"github.com/openclarity/vmclarity/pkg/shared/backendclient"
"github.com/openclarity/vmclarity/pkg/shared/log"
"github.com/openclarity/vmclarity/runtime_scan/pkg/orchestrator"
uibackend "github.com/openclarity/vmclarity/ui_backend/pkg/rest"
)

Expand Down
0 ...orchestrator/assetscanprocessor/common.go → ...orchestrator/assetscanprocessor/common.go
View file
File renamed without changes.
0 ...orchestrator/assetscanprocessor/config.go → ...orchestrator/assetscanprocessor/config.go
View file
File renamed without changes.
0 ...chestrator/assetscanprocessor/exploits.go → ...chestrator/assetscanprocessor/exploits.go
View file
File renamed without changes.
0 ...rchestrator/assetscanprocessor/malware.go → ...rchestrator/assetscanprocessor/malware.go
View file
File renamed without changes.
0 ...r/assetscanprocessor/misconfigurations.go → ...r/assetscanprocessor/misconfigurations.go
View file
File renamed without changes.
0 ...chestrator/assetscanprocessor/packages.go → ...chestrator/assetscanprocessor/packages.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...hestrator/assetscanprocessor/processor.go → ...hestrator/assetscanprocessor/processor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"github.com/sirupsen/logrus"

"github.com/openclarity/vmclarity/api/models"
"github.com/openclarity/vmclarity/pkg/orchestrator/common"
"github.com/openclarity/vmclarity/pkg/shared/backendclient"
"github.com/openclarity/vmclarity/pkg/shared/log"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/orchestrator/common"
)

type AssetScanProcessor struct {
Expand Down
0 ...chestrator/assetscanprocessor/rootkits.go → ...chestrator/assetscanprocessor/rootkits.go
View file
File renamed without changes.
0 ...rchestrator/assetscanprocessor/secrets.go → ...rchestrator/assetscanprocessor/secrets.go
View file
File renamed without changes.
0 ...tor/assetscanprocessor/vulnerabilities.go → ...tor/assetscanprocessor/vulnerabilities.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...g/orchestrator/assetscanwatcher/config.go → pkg/orchestrator/assetscanwatcher/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package assetscanwatcher
import (
"time"

"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/shared/backendclient"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
)

const (
Expand Down
0 ...tor/assetscanwatcher/delete_job_policy.go → ...tor/assetscanwatcher/delete_job_policy.go
View file
File renamed without changes.
0 ...kg/orchestrator/assetscanwatcher/event.go → pkg/orchestrator/assetscanwatcher/event.go
View file
File renamed without changes.
0 ...orchestrator/assetscanwatcher/families.go → ...orchestrator/assetscanwatcher/families.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .../orchestrator/assetscanwatcher/helpers.go → pkg/orchestrator/assetscanwatcher/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"gopkg.in/yaml.v3"

"github.com/openclarity/vmclarity/api/models"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
)

type jobConfigInput struct {
Expand Down
4 changes: 2 additions & 2 deletions .../orchestrator/assetscanwatcher/watcher.go → pkg/orchestrator/assetscanwatcher/watcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
"time"

"github.com/openclarity/vmclarity/api/models"
"github.com/openclarity/vmclarity/pkg/orchestrator/common"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/shared/backendclient"
"github.com/openclarity/vmclarity/pkg/shared/log"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/orchestrator/common"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
)

type (
Expand Down
0 ...ime_scan/pkg/orchestrator/common/event.go → pkg/orchestrator/common/event.go
View file
File renamed without changes.
0 ...me_scan/pkg/orchestrator/common/poller.go → pkg/orchestrator/common/poller.go
View file
File renamed without changes.
0 ...ime_scan/pkg/orchestrator/common/queue.go → pkg/orchestrator/common/queue.go
View file
File renamed without changes.
0 ...can/pkg/orchestrator/common/queue_test.go → pkg/orchestrator/common/queue_test.go
View file
File renamed without changes.
0 ...can/pkg/orchestrator/common/reconciler.go → pkg/orchestrator/common/reconciler.go
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions runtime_scan/pkg/orchestrator/config.go → pkg/orchestrator/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import (
"github.com/spf13/viper"

"github.com/openclarity/vmclarity/api/models"
"github.com/openclarity/vmclarity/runtime_scan/pkg/orchestrator/assetscanprocessor"
"github.com/openclarity/vmclarity/runtime_scan/pkg/orchestrator/assetscanwatcher"
"github.com/openclarity/vmclarity/runtime_scan/pkg/orchestrator/discovery"
"github.com/openclarity/vmclarity/runtime_scan/pkg/orchestrator/scanconfigwatcher"
"github.com/openclarity/vmclarity/runtime_scan/pkg/orchestrator/scanwatcher"
"github.com/openclarity/vmclarity/pkg/orchestrator/assetscanprocessor"
"github.com/openclarity/vmclarity/pkg/orchestrator/assetscanwatcher"
"github.com/openclarity/vmclarity/pkg/orchestrator/discovery"
"github.com/openclarity/vmclarity/pkg/orchestrator/scanconfigwatcher"
"github.com/openclarity/vmclarity/pkg/orchestrator/scanwatcher"
)

const (
Expand Down
0 runtime_scan/pkg/orchestrator/controller.go → pkg/orchestrator/controller.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...scan/pkg/orchestrator/discovery/config.go → pkg/orchestrator/discovery/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package discovery
import (
"time"

"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/shared/backendclient"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion .../pkg/orchestrator/discovery/discoverer.go → pkg/orchestrator/discovery/discoverer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
log "github.com/sirupsen/logrus"

"github.com/openclarity/vmclarity/api/models"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/shared/backendclient"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
)

const (
Expand Down
20 changes: 10 additions & 10 deletions ...ime_scan/pkg/orchestrator/orchestrator.go → pkg/orchestrator/orchestrator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ import (
"time"

"github.com/openclarity/vmclarity/api/models"
"github.com/openclarity/vmclarity/pkg/orchestrator/assetscanprocessor"
"github.com/openclarity/vmclarity/pkg/orchestrator/assetscanwatcher"
"github.com/openclarity/vmclarity/pkg/orchestrator/discovery"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider/aws"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider/azure"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider/external"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider/gcp"
"github.com/openclarity/vmclarity/pkg/orchestrator/scanconfigwatcher"
"github.com/openclarity/vmclarity/pkg/orchestrator/scanwatcher"
"github.com/openclarity/vmclarity/pkg/shared/backendclient"
"github.com/openclarity/vmclarity/pkg/shared/log"
"github.com/openclarity/vmclarity/runtime_scan/pkg/orchestrator/assetscanprocessor"
"github.com/openclarity/vmclarity/runtime_scan/pkg/orchestrator/assetscanwatcher"
"github.com/openclarity/vmclarity/runtime_scan/pkg/orchestrator/discovery"
"github.com/openclarity/vmclarity/runtime_scan/pkg/orchestrator/scanconfigwatcher"
"github.com/openclarity/vmclarity/runtime_scan/pkg/orchestrator/scanwatcher"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider/aws"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider/azure"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider/external"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider/gcp"
)

type Orchestrator struct {
Expand Down
4 changes: 2 additions & 2 deletions runtime_scan/pkg/provider/aws/client.go → pkg/orchestrator/provider/aws/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ import (
"github.com/sirupsen/logrus"

"github.com/openclarity/vmclarity/api/models"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider/cloudinit"
"github.com/openclarity/vmclarity/pkg/shared/log"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider/cloudinit"
)

type Client struct {
Expand Down
0 runtime_scan/pkg/provider/aws/client_test.go → pkg/orchestrator/provider/aws/client_test.go
View file
File renamed without changes.
0 runtime_scan/pkg/provider/aws/config.go → pkg/orchestrator/provider/aws/config.go
View file
File renamed without changes.
0 runtime_scan/pkg/provider/aws/config_test.go → pkg/orchestrator/provider/aws/config_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion runtime_scan/pkg/provider/aws/errors.go → pkg/orchestrator/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"

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

type (
Expand Down
2 changes: 1 addition & 1 deletion runtime_scan/pkg/provider/aws/helpers.go → pkg/orchestrator/provider/aws/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"

"github.com/openclarity/vmclarity/api/models"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
)

func EC2TagsFromScanMetadata(meta provider.ScanMetadata) []ec2types.Tag {
Expand Down
2 changes: 1 addition & 1 deletion runtime_scan/pkg/provider/aws/instance.go → pkg/orchestrator/provider/aws/instance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"github.com/sirupsen/logrus"

"github.com/openclarity/vmclarity/api/models"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/shared/log"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
)

type Instance struct {
Expand Down
0 runtime_scan/pkg/provider/aws/location.go → pkg/orchestrator/provider/aws/location.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion runtime_scan/pkg/provider/aws/snapshot.go → pkg/orchestrator/provider/aws/snapshot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
"github.com/sirupsen/logrus"

"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/shared/log"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
)

type Snapshot struct {
Expand Down
0 runtime_scan/pkg/provider/aws/types.go → pkg/orchestrator/provider/aws/types.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion runtime_scan/pkg/provider/aws/volume.go → pkg/orchestrator/provider/aws/volume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
"github.com/sirupsen/logrus"

"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/shared/log"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
)

type Volume struct {
Expand Down
2 changes: 1 addition & 1 deletion runtime_scan/pkg/provider/azure/blob.go → pkg/orchestrator/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"

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

var (
Expand Down
2 changes: 1 addition & 1 deletion runtime_scan/pkg/provider/azure/client.go → pkg/orchestrator/provider/azure/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources"

"github.com/openclarity/vmclarity/api/models"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion runtime_scan/pkg/provider/azure/common.go → pkg/orchestrator/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"

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

func handleAzureRequestError(err error, actionTmpl string, parts ...interface{}) (bool, error) {
Expand Down
0 runtime_scan/pkg/provider/azure/config.go → pkg/orchestrator/provider/azure/config.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...an/pkg/provider/azure/networkInterface.go → ...trator/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"

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

var (
Expand Down
4 changes: 2 additions & 2 deletions runtime_scan/pkg/provider/azure/scannerVm.go → pkg/orchestrator/provider/azure/scannerVm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4"
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v3"

"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider/cloudinit"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider/cloudinit"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion runtime_scan/pkg/provider/azure/snapshot.go → pkg/orchestrator/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"

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

var (
Expand Down
2 changes: 1 addition & 1 deletion ...ime_scan/pkg/provider/azure/targetDisk.go → ...orchestrator/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"

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

var (
Expand Down
0 runtime_scan/pkg/provider/azure/types.go → pkg/orchestrator/provider/azure/types.go
View file
File renamed without changes.
0 ...g/provider/cloudinit/cloud-init.tmpl.yaml → ...r/provider/cloudinit/cloud-init.tmpl.yaml
View file
File renamed without changes.
0 ..._scan/pkg/provider/cloudinit/cloudinit.go → ...hestrator/provider/cloudinit/cloudinit.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .../pkg/provider/cloudinit/cloudinit_test.go → ...ator/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"

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

//go:embed testdata/cloud-init.yaml
Expand Down
0 ...ovider/cloudinit/testdata/cloud-init.yaml → ...ovider/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 runtime_scan/pkg/provider/errors.go → pkg/orchestrator/provider/errors.go
View file
File renamed without changes.
0 runtime_scan/pkg/provider/errors_test.go → pkg/orchestrator/provider/errors_test.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions runtime_scan/pkg/provider/external/client.go → pkg/orchestrator/provider/external/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"google.golang.org/grpc/credentials/insecure"

"github.com/openclarity/vmclarity/api/models"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
provider_service "github.com/openclarity/vmclarity/runtime_scan/pkg/provider/external/proto"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
provider_service "github.com/openclarity/vmclarity/pkg/orchestrator/provider/external/proto"
)

type Client struct {
Expand Down
0 runtime_scan/pkg/provider/external/config.go → pkg/orchestrator/provider/external/config.go
View file
File renamed without changes.
0 runtime_scan/pkg/provider/external/gen.go → pkg/orchestrator/provider/external/gen.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ime_scan/pkg/provider/external/helpers.go → ...orchestrator/provider/external/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"google.golang.org/protobuf/types/known/timestamppb"

"github.com/openclarity/vmclarity/api/models"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
provider_service "github.com/openclarity/vmclarity/pkg/orchestrator/provider/external/proto"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
provider_service "github.com/openclarity/vmclarity/runtime_scan/pkg/provider/external/proto"
)

func convertAssetToModels(asset *provider_service.Asset) (models.Asset, error) {
Expand Down
4 changes: 2 additions & 2 deletions ...can/pkg/provider/external/helpers_test.go → ...strator/provider/external/helpers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"gotest.tools/v3/assert"

"github.com/openclarity/vmclarity/api/models"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
provider_service "github.com/openclarity/vmclarity/pkg/orchestrator/provider/external/proto"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
provider_service "github.com/openclarity/vmclarity/runtime_scan/pkg/provider/external/proto"
)

func Test_convertAssetToModels(t *testing.T) {
Expand Down
0 ...der/external/proto/provider_service.pb.go → ...der/external/proto/provider_service.pb.go
View file
File renamed without changes.
0 ...der/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.
2 changes: 1 addition & 1 deletion runtime_scan/pkg/provider/gcp/client.go → pkg/orchestrator/provider/gcp/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
"google.golang.org/api/iterator"

"github.com/openclarity/vmclarity/api/models"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/shared/log"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
)

type Client struct {
Expand Down
0 runtime_scan/pkg/provider/gcp/client_test.go → pkg/orchestrator/provider/gcp/client_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion runtime_scan/pkg/provider/gcp/common.go → pkg/orchestrator/provider/gcp/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
log "github.com/sirupsen/logrus"
"google.golang.org/api/googleapi"

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

func handleGcpRequestError(err error, actionTmpl string, parts ...interface{}) (bool, error) {
Expand Down
0 runtime_scan/pkg/provider/gcp/config.go → pkg/orchestrator/provider/gcp/config.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions runtime_scan/pkg/provider/gcp/scannerVm.go → pkg/orchestrator/provider/gcp/scannerVm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (

"cloud.google.com/go/compute/apiv1/computepb"

"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider/cloudinit"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider/cloudinit"
)

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

"cloud.google.com/go/compute/apiv1/computepb"

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

var (
Expand Down
2 changes: 1 addition & 1 deletion runtime_scan/pkg/provider/gcp/targetDisk.go → pkg/orchestrator/provider/gcp/targetDisk.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

"cloud.google.com/go/compute/apiv1/computepb"

"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
)

var (
Expand Down
0 runtime_scan/pkg/provider/gcp/types.go → pkg/orchestrator/provider/gcp/types.go
View file
File renamed without changes.
0 runtime_scan/pkg/provider/types.go → pkg/orchestrator/provider/types.go
View file
File renamed without changes.
0 .../orchestrator/scanconfigwatcher/config.go → pkg/orchestrator/scanconfigwatcher/config.go
View file
File renamed without changes.
0 ...g/orchestrator/scanconfigwatcher/event.go → pkg/orchestrator/scanconfigwatcher/event.go
View file
File renamed without changes.
0 ...orchestrator/scanconfigwatcher/helpers.go → ...orchestrator/scanconfigwatcher/helpers.go
View file
File renamed without changes.
0 ...rchestrator/scanconfigwatcher/schedule.go → ...rchestrator/scanconfigwatcher/schedule.go
View file
File renamed without changes.
0 ...trator/scanconfigwatcher/schedule_test.go → ...trator/scanconfigwatcher/schedule_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...orchestrator/scanconfigwatcher/watcher.go → ...orchestrator/scanconfigwatcher/watcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"time"

"github.com/openclarity/vmclarity/api/models"
"github.com/openclarity/vmclarity/pkg/orchestrator/common"
"github.com/openclarity/vmclarity/pkg/shared/backendclient"
"github.com/openclarity/vmclarity/pkg/shared/log"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/orchestrator/common"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion ...an/pkg/orchestrator/scanwatcher/config.go → pkg/orchestrator/scanwatcher/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package scanwatcher
import (
"time"

"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/shared/backendclient"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
)

const (
Expand Down
0 ...can/pkg/orchestrator/scanwatcher/event.go → pkg/orchestrator/scanwatcher/event.go
View file
File renamed without changes.
0 ...n/pkg/orchestrator/scanwatcher/helpers.go → pkg/orchestrator/scanwatcher/helpers.go
View file
File renamed without changes.
0 .../orchestrator/scanwatcher/helpers_test.go → pkg/orchestrator/scanwatcher/helpers_test.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...n/pkg/orchestrator/scanwatcher/watcher.go → pkg/orchestrator/scanwatcher/watcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"time"

"github.com/openclarity/vmclarity/api/models"
"github.com/openclarity/vmclarity/pkg/orchestrator/common"
"github.com/openclarity/vmclarity/pkg/orchestrator/provider"
"github.com/openclarity/vmclarity/pkg/shared/backendclient"
"github.com/openclarity/vmclarity/pkg/shared/log"
"github.com/openclarity/vmclarity/pkg/shared/utils"
"github.com/openclarity/vmclarity/runtime_scan/pkg/orchestrator/common"
"github.com/openclarity/vmclarity/runtime_scan/pkg/provider"
)

type (
Expand Down
Loading

0 comments on commit 5acc3b6

Please sign in to comment.