1
0
Fork 0
mirror of https://github.com/gocsaf/csaf.git synced 2025-12-22 11:55:40 +01:00

Fix go.mod and internal dependencies (#371)

* Use a "/v2" in the module path to match the git version tag which
   lead with a 2. Change all mention of the module as dependency
   internally as well.
This commit is contained in:
Bernhard E. Reiter 2023-06-05 10:24:35 +02:00 committed by GitHub
parent 02d476360b
commit cf49c7e414
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 48 additions and 48 deletions

View file

@ -13,7 +13,7 @@ import (
"io" "io"
"net/http" "net/http"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
var errNotFound = errors.New("not found") var errNotFound = errors.New("not found")

View file

@ -20,8 +20,8 @@ import (
"github.com/BurntSushi/toml" "github.com/BurntSushi/toml"
"github.com/ProtonMail/gopenpgp/v2/crypto" "github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
"golang.org/x/time/rate" "golang.org/x/time/rate"
) )

View file

@ -18,8 +18,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
type fullJob struct { type fullJob struct {

View file

@ -20,8 +20,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
const ( const (

View file

@ -25,8 +25,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
type interimJob struct { type interimJob struct {

View file

@ -13,7 +13,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
type lazyTransaction struct { type lazyTransaction struct {

View file

@ -11,8 +11,8 @@ package main
import ( import (
"fmt" "fmt"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
// mirrorAllowed checks if mirroring is allowed. // mirrorAllowed checks if mirroring is allowed.

View file

@ -15,7 +15,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
"github.com/gofrs/flock" "github.com/gofrs/flock"
"github.com/jessevdk/go-flags" "github.com/jessevdk/go-flags"
) )

View file

@ -30,8 +30,8 @@ import (
"github.com/ProtonMail/gopenpgp/v2/constants" "github.com/ProtonMail/gopenpgp/v2/constants"
"github.com/ProtonMail/gopenpgp/v2/crypto" "github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
// mirrorAllowed checks if mirroring is allowed. // mirrorAllowed checks if mirroring is allowed.

View file

@ -15,8 +15,8 @@ import (
"path/filepath" "path/filepath"
"github.com/ProtonMail/gopenpgp/v2/crypto" "github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
type processor struct { type processor struct {

View file

@ -14,7 +14,7 @@ import (
"net/url" "net/url"
"github.com/PuerkitoBio/goquery" "github.com/PuerkitoBio/goquery"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
type ( type (

View file

@ -22,7 +22,7 @@ import (
"net/http" "net/http"
"os" "os"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
"github.com/jessevdk/go-flags" "github.com/jessevdk/go-flags"
) )

View file

@ -32,8 +32,8 @@ import (
"github.com/ProtonMail/gopenpgp/v2/crypto" "github.com/ProtonMail/gopenpgp/v2/crypto"
"golang.org/x/time/rate" "golang.org/x/time/rate"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
// topicMessages stores the collected topicMessages for a specific topic. // topicMessages stores the collected topicMessages for a specific topic.

View file

@ -12,7 +12,7 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
) )
// MessageType is the kind of the message. // MessageType is the kind of the message.

View file

@ -13,7 +13,7 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
) )
type ( type (

View file

@ -31,8 +31,8 @@ import (
"time" "time"
"github.com/ProtonMail/gopenpgp/v2/crypto" "github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
"golang.org/x/time/rate" "golang.org/x/time/rate"
) )

View file

@ -17,7 +17,7 @@ import (
"os" "os"
"os/signal" "os/signal"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
"github.com/jessevdk/go-flags" "github.com/jessevdk/go-flags"
) )

View file

@ -25,8 +25,8 @@ import (
"github.com/ProtonMail/gopenpgp/v2/armor" "github.com/ProtonMail/gopenpgp/v2/armor"
"github.com/ProtonMail/gopenpgp/v2/constants" "github.com/ProtonMail/gopenpgp/v2/constants"
"github.com/ProtonMail/gopenpgp/v2/crypto" "github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
const dateFormat = time.RFC3339 const dateFormat = time.RFC3339

View file

@ -16,7 +16,7 @@ import (
"github.com/BurntSushi/toml" "github.com/BurntSushi/toml"
"github.com/ProtonMail/gopenpgp/v2/crypto" "github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
) )

View file

@ -20,8 +20,8 @@ import (
"unicode" "unicode"
"github.com/ProtonMail/gopenpgp/v2/crypto" "github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
// ensureFolders initializes the paths and call functions to create // ensureFolders initializes the paths and call functions to create

View file

@ -13,7 +13,7 @@ import (
"crypto/sha512" "crypto/sha512"
"os" "os"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
func writeHashedFile(fname, name string, data []byte, armored string) error { func writeHashedFile(fname, name string, data []byte, armored string) error {

View file

@ -18,7 +18,7 @@ import (
"sort" "sort"
"time" "time"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
func updateIndex(dir, fname string) error { func updateIndex(dir, fname string) error {

View file

@ -16,7 +16,7 @@ import (
"net/http/cgi" "net/http/cgi"
"os" "os"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
"github.com/jessevdk/go-flags" "github.com/jessevdk/go-flags"
) )

View file

@ -15,8 +15,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
// mergeCategories merges the given categories into the old ones. // mergeCategories merges the given categories into the old ones.

View file

@ -12,8 +12,8 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
func doTransaction( func doTransaction(

View file

@ -27,8 +27,8 @@ import (
"github.com/ProtonMail/gopenpgp/v2/armor" "github.com/ProtonMail/gopenpgp/v2/armor"
"github.com/ProtonMail/gopenpgp/v2/constants" "github.com/ProtonMail/gopenpgp/v2/constants"
"github.com/ProtonMail/gopenpgp/v2/crypto" "github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
"github.com/jessevdk/go-flags" "github.com/jessevdk/go-flags"
"github.com/mitchellh/go-homedir" "github.com/mitchellh/go-homedir"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"

View file

@ -16,8 +16,8 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/csaf-poc/csaf_distribution/csaf" "github.com/csaf-poc/csaf_distribution/v2/csaf"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
"github.com/jessevdk/go-flags" "github.com/jessevdk/go-flags"
) )

View file

@ -15,7 +15,7 @@ import (
"net/url" "net/url"
"strings" "strings"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
// AdvisoryFile constructs the urls of a remote file. // AdvisoryFile constructs the urls of a remote file.

View file

@ -17,7 +17,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
// TLPLabel is the traffic light policy of the CSAF. // TLPLabel is the traffic light policy of the CSAF.

View file

@ -17,7 +17,7 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
// ProviderMetadataLoader helps load provider-metadata.json from // ProviderMetadataLoader helps load provider-metadata.json from

View file

@ -14,7 +14,7 @@ import (
"sort" "sort"
"time" "time"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
// ROLIEServiceWorkspaceCollectionCategoriesCategory is a category in a ROLIE service collection. // ROLIEServiceWorkspaceCollectionCategoriesCategory is a category in a ROLIE service collection.

View file

@ -11,7 +11,7 @@ package csaf
import ( import (
"time" "time"
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/v2/util"
) )
const ( const (

2
go.mod
View file

@ -1,4 +1,4 @@
module github.com/csaf-poc/csaf_distribution module github.com/csaf-poc/csaf_distribution/v2
go 1.20 go 1.20