Skip to content

Commit

Permalink
chore: Renamed go module to allow go install of the tool (#11)
Browse files Browse the repository at this point in the history 
Signed-off-by: Bengt Wegner <Jochen.Wegner@ibm.com>
  • Loading branch information
@Petzys
Petzys authored Sep 19, 2024
1 parent 8d760c2 commit 92600c0
Show file tree
Hide file tree
Showing 24 changed files with 71 additions and 58 deletions.
2 changes: 1 addition & 1 deletion cbomkit-theia.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package main

import (
"ibm/cbomkit-theia/cmd"
"github.com/IBM/cbomkit-theia/cmd"
"log/slog"
"os"
)
Expand Down
10 changes: 5 additions & 5 deletions cbomkit-theia_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import (
"path/filepath"
"testing"

"ibm/cbomkit-theia/provider/cyclonedx"
"ibm/cbomkit-theia/provider/docker"
"ibm/cbomkit-theia/provider/filesystem"
"ibm/cbomkit-theia/scanner"
"ibm/cbomkit-theia/scanner/hash"
"github.com/IBM/cbomkit-theia/provider/cyclonedx"
"github.com/IBM/cbomkit-theia/provider/docker"
"github.com/IBM/cbomkit-theia/provider/filesystem"
"github.com/IBM/cbomkit-theia/scanner"
"github.com/IBM/cbomkit-theia/scanner/hash"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
7 changes: 4 additions & 3 deletions cmd/dir.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@
package cmd

import (
"ibm/cbomkit-theia/provider/filesystem"
"ibm/cbomkit-theia/scanner"
"ibm/cbomkit-theia/scanner/plugins"
"io"
"os"

"github.com/IBM/cbomkit-theia/provider/filesystem"
"github.com/IBM/cbomkit-theia/scanner"
"github.com/IBM/cbomkit-theia/scanner/plugins"

"github.com/spf13/cobra"
"github.com/spf13/viper"
"go.uber.org/dig"
Expand Down
2 changes: 1 addition & 1 deletion cmd/image/build.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package image

import (
"ibm/cbomkit-theia/provider/docker"
"github.com/IBM/cbomkit-theia/provider/docker"

"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/image/get.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package image

import (
"ibm/cbomkit-theia/provider/docker"
"github.com/IBM/cbomkit-theia/provider/docker"

"github.com/spf13/cobra"
)
Expand Down
9 changes: 5 additions & 4 deletions cmd/image/image.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
package image

import (
"ibm/cbomkit-theia/provider/docker"
"ibm/cbomkit-theia/provider/filesystem"
"ibm/cbomkit-theia/scanner"
"ibm/cbomkit-theia/scanner/plugins"
"io"
"os"

"github.com/IBM/cbomkit-theia/provider/docker"
"github.com/IBM/cbomkit-theia/provider/filesystem"
"github.com/IBM/cbomkit-theia/scanner"
"github.com/IBM/cbomkit-theia/scanner/plugins"

"github.com/spf13/cobra"
"github.com/spf13/viper"
"go.uber.org/dig"
Expand Down
5 changes: 3 additions & 2 deletions cmd/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ package cmd

import (
"fmt"
"ibm/cbomkit-theia/cmd/image"
"ibm/cbomkit-theia/scanner"
"os"
"path/filepath"

"github.com/IBM/cbomkit-theia/cmd/image"
"github.com/IBM/cbomkit-theia/scanner"

"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package cmd

import (
"ibm/cbomkit-theia/server"
"github.com/IBM/cbomkit-theia/server"

"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module ibm/cbomkit-theia
module github.com/IBM/cbomkit-theia

go 1.23.0

Expand Down
2 changes: 1 addition & 1 deletion provider/docker/image.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"path/filepath"
"strings"

"ibm/cbomkit-theia/provider/filesystem"
"github.com/IBM/cbomkit-theia/provider/filesystem"

"github.com/anchore/go-logger"
"github.com/anchore/go-logger/adapter/logrus"
Expand Down
4 changes: 2 additions & 2 deletions provider/docker/layer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"io"
"log/slog"

"ibm/cbomkit-theia/provider/filesystem"
scanner_errors "ibm/cbomkit-theia/scanner/errors"
"github.com/IBM/cbomkit-theia/provider/filesystem"
scanner_errors "github.com/IBM/cbomkit-theia/scanner/errors"

"github.com/anchore/stereoscope/pkg/file"
"github.com/anchore/stereoscope/pkg/filetree/filenode"
Expand Down
3 changes: 2 additions & 1 deletion provider/filesystem/filesystem.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ package filesystem
import (
go_errors "errors"
"fmt"
scanner_errors "ibm/cbomkit-theia/scanner/errors"
"io"
"io/fs"
"log/slog"
"os"
"path/filepath"

scanner_errors "github.com/IBM/cbomkit-theia/scanner/errors"

v1 "github.com/google/go-containerregistry/pkg/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion scanner/bom-dag/vertex.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package bomdag

import (
"ibm/cbomkit-theia/scanner/hash"
"github.com/IBM/cbomkit-theia/scanner/hash"

"github.com/dominikbraun/graph"
)
Expand Down
2 changes: 1 addition & 1 deletion scanner/componentwithconfidenceslice/componentwithconfidence-slice.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package componentwithconfidenceslice

import (
"ibm/cbomkit-theia/scanner/confidencelevel"
"github.com/IBM/cbomkit-theia/scanner/confidencelevel"

cdx "github.com/CycloneDX/cyclonedx-go"
)
Expand Down
11 changes: 6 additions & 5 deletions scanner/plugins/certificates/certificates.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,20 @@ package certificates
import (
"encoding/pem"
"errors"
"ibm/cbomkit-theia/provider/filesystem"
scanner_errors "ibm/cbomkit-theia/scanner/errors"
pemutility "ibm/cbomkit-theia/scanner/pem-utility"
"ibm/cbomkit-theia/scanner/plugins"
"log/slog"
"os"
"path/filepath"
"slices"
"strings"

"github.com/IBM/cbomkit-theia/provider/filesystem"
scanner_errors "github.com/IBM/cbomkit-theia/scanner/errors"
pemutility "github.com/IBM/cbomkit-theia/scanner/pem-utility"
"github.com/IBM/cbomkit-theia/scanner/plugins"

"go.mozilla.org/pkcs7"

bomdag "ibm/cbomkit-theia/scanner/bom-dag"
bomdag "github.com/IBM/cbomkit-theia/scanner/bom-dag"

cdx "github.com/CycloneDX/cyclonedx-go"
)
Expand Down
4 changes: 2 additions & 2 deletions scanner/plugins/certificates/x509.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"path/filepath"
"time"

bomdag "ibm/cbomkit-theia/scanner/bom-dag"
pemutility "ibm/cbomkit-theia/scanner/pem-utility"
bomdag "github.com/IBM/cbomkit-theia/scanner/bom-dag"
pemutility "github.com/IBM/cbomkit-theia/scanner/pem-utility"

"github.com/google/uuid"

Expand Down
7 changes: 4 additions & 3 deletions scanner/plugins/javasecurity/config_parsing.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ package javasecurity
import (
go_errors "errors"
"fmt"
"ibm/cbomkit-theia/provider/filesystem"
advancedcomponentslice "ibm/cbomkit-theia/scanner/componentwithconfidenceslice"
scanner_errors "ibm/cbomkit-theia/scanner/errors"
"log/slog"
"path/filepath"
"strconv"
"strings"

"github.com/IBM/cbomkit-theia/provider/filesystem"
advancedcomponentslice "github.com/IBM/cbomkit-theia/scanner/componentwithconfidenceslice"
scanner_errors "github.com/IBM/cbomkit-theia/scanner/errors"

cdx "github.com/CycloneDX/cyclonedx-go"
v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/magiconair/properties"
Expand Down
3 changes: 2 additions & 1 deletion scanner/plugins/javasecurity/config_parsing_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ package javasecurity

import (
"fmt"
"ibm/cbomkit-theia/provider/docker"
"os"
"strconv"
"testing"

"github.com/IBM/cbomkit-theia/provider/docker"

"github.com/magiconair/properties"
"github.com/stretchr/testify/assert"
)
Expand Down
9 changes: 5 additions & 4 deletions scanner/plugins/javasecurity/javasecurity.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ package javasecurity
import (
go_errors "errors"
"fmt"
"ibm/cbomkit-theia/provider/filesystem"
advancedcomponentslice "ibm/cbomkit-theia/scanner/componentwithconfidenceslice"
scanner_errors "ibm/cbomkit-theia/scanner/errors"
"ibm/cbomkit-theia/scanner/plugins"
"log/slog"
"os"
"path/filepath"
"strings"

"github.com/IBM/cbomkit-theia/provider/filesystem"
advancedcomponentslice "github.com/IBM/cbomkit-theia/scanner/componentwithconfidenceslice"
scanner_errors "github.com/IBM/cbomkit-theia/scanner/errors"
"github.com/IBM/cbomkit-theia/scanner/plugins"

cdx "github.com/CycloneDX/cyclonedx-go"
v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/magiconair/properties"
Expand Down
7 changes: 4 additions & 3 deletions scanner/plugins/javasecurity/protocol_restrictions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ package javasecurity
import (
go_errors "errors"
"fmt"
advancedcomponentslice "ibm/cbomkit-theia/scanner/componentwithconfidenceslice"
"ibm/cbomkit-theia/scanner/confidencelevel"
scanner_errors "ibm/cbomkit-theia/scanner/errors"
"log/slog"
"strconv"
"strings"

advancedcomponentslice "github.com/IBM/cbomkit-theia/scanner/componentwithconfidenceslice"
"github.com/IBM/cbomkit-theia/scanner/confidencelevel"
scanner_errors "github.com/IBM/cbomkit-theia/scanner/errors"

cdx "github.com/CycloneDX/cyclonedx-go"
)

Expand Down
3 changes: 2 additions & 1 deletion scanner/plugins/plugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
package plugins

import (
"ibm/cbomkit-theia/provider/filesystem"
"strings"

"github.com/IBM/cbomkit-theia/provider/filesystem"

cdx "github.com/CycloneDX/cyclonedx-go"
)

Expand Down
9 changes: 5 additions & 4 deletions scanner/plugins/secrets/secrets.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
package secrets

import (
"ibm/cbomkit-theia/provider/filesystem"
bomdag "ibm/cbomkit-theia/scanner/bom-dag"
pemutility "ibm/cbomkit-theia/scanner/pem-utility"
"ibm/cbomkit-theia/scanner/plugins"
"log/slog"
"strings"

"github.com/IBM/cbomkit-theia/provider/filesystem"
bomdag "github.com/IBM/cbomkit-theia/scanner/bom-dag"
pemutility "github.com/IBM/cbomkit-theia/scanner/pem-utility"
"github.com/IBM/cbomkit-theia/scanner/plugins"

cdx "github.com/CycloneDX/cyclonedx-go"
"github.com/gabriel-vasile/mimetype"
"github.com/zricethezav/gitleaks/v8/detect"
Expand Down
13 changes: 7 additions & 6 deletions scanner/scanner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,20 @@ package scanner
import (
"errors"
"fmt"
"ibm/cbomkit-theia/provider/cyclonedx"
"ibm/cbomkit-theia/provider/filesystem"
plugin_package "ibm/cbomkit-theia/scanner/plugins"
"ibm/cbomkit-theia/scanner/plugins/certificates"
"ibm/cbomkit-theia/scanner/plugins/javasecurity"
"ibm/cbomkit-theia/scanner/plugins/secrets"
"io"
"log"
"log/slog"
"os"
"slices"
"time"

"github.com/IBM/cbomkit-theia/provider/cyclonedx"
"github.com/IBM/cbomkit-theia/provider/filesystem"
plugin_package "github.com/IBM/cbomkit-theia/scanner/plugins"
"github.com/IBM/cbomkit-theia/scanner/plugins/certificates"
"github.com/IBM/cbomkit-theia/scanner/plugins/javasecurity"
"github.com/IBM/cbomkit-theia/scanner/plugins/secrets"

cdx "github.com/CycloneDX/cyclonedx-go"
"github.com/google/uuid"
"go.uber.org/dig"
Expand Down
9 changes: 5 additions & 4 deletions server/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@ package server

import (
"bytes"
"ibm/cbomkit-theia/provider/docker"
"ibm/cbomkit-theia/provider/filesystem"
"ibm/cbomkit-theia/scanner"
"ibm/cbomkit-theia/scanner/plugins"
"io"
"net/http"

"github.com/IBM/cbomkit-theia/provider/docker"
"github.com/IBM/cbomkit-theia/provider/filesystem"
"github.com/IBM/cbomkit-theia/scanner"
"github.com/IBM/cbomkit-theia/scanner/plugins"

"go.uber.org/dig"

cdx "github.com/CycloneDX/cyclonedx-go"
Expand Down

0 comments on commit 92600c0

Please sign in to comment.