-
Notifications
You must be signed in to change notification settings - Fork 111
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add the nocgo build flag to enable a build without sqlite3 #129
Open
silasdavis
wants to merge
1
commit into
keratin:main
Choose a base branch
from
silasdavis:nocgo
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
// +build !nocgo | ||
|
||
package sqlite3 | ||
|
||
import ( | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
// +build nocgo | ||
|
||
// This stub package allows authn-server to be build without CGO, i.e. with CGO_ENABLED=0. This has numerous advantages | ||
// including on toolchains where static linking is impossible. In order to use it run with `go build -tags nocgo`. | ||
|
||
package sqlite3 | ||
|
||
import ( | ||
"time" | ||
|
||
"github.com/jmoiron/sqlx" | ||
"github.com/keratin/authn-server/ops" | ||
) | ||
|
||
var placeholder = "generating" | ||
|
||
type BlobStore struct { | ||
TTL time.Duration | ||
LockTime time.Duration | ||
DB sqlx.Ext | ||
} | ||
|
||
func (s *BlobStore) Clean(reporter ops.ErrorReporter) { | ||
panic("Cannot use sqlite3 BlobStore because building with nocgo build tag") | ||
} | ||
|
||
func (s *BlobStore) Read(name string) ([]byte, error) { | ||
panic("Cannot use sqlite3 BlobStore because building with nocgo build tag") | ||
} | ||
|
||
func (s *BlobStore) WriteNX(name string, blob []byte) (bool, error) { | ||
panic("Cannot use sqlite3 BlobStore because building with nocgo build tag") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
// +build !nocgo | ||
|
||
package sqlite3_test | ||
|
||
import ( | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
// +build !nocgo | ||
|
||
package sqlite3 | ||
|
||
import ( | ||
|
@@ -6,19 +8,23 @@ import ( | |
|
||
"github.com/jmoiron/sqlx" | ||
// load sqlite3 library with side effects | ||
_ "github.com/mattn/go-sqlite3" | ||
sq3 "github.com/mattn/go-sqlite3" | ||
) | ||
|
||
type Error = sq3.Error | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Pushing these aliases here just means we can isolate the CGO requiring files and wont' need another |
||
|
||
var ErrConstraintUnique = sq3.ErrConstraintUnique | ||
|
||
func NewDB(env string) (*sqlx.DB, error) { | ||
// https://github.com/mattn/go-sqlite3/issues/274#issuecomment-232942571 | ||
// enable a busy timeout for concurrent load. keep it short. the busy timeout can be harmful | ||
// under sustained load, but helpful during short bursts. | ||
// this block used to keep backward compatibility | ||
|
||
// this block used to keep backward compatibility | ||
if !strings.Contains(env, ".") { | ||
env = "./"+ env +".db" | ||
env = "./" + env + ".db" | ||
} | ||
|
||
return sqlx.Connect("sqlite3", fmt.Sprintf("%v?cache=shared&_busy_timeout=200", env)) | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
// +build nocgo | ||
|
||
// This stub package allows authn-server to be build without CGO, i.e. with CGO_ENABLED=0. This has numerous advantages | ||
// including on toolchains where static linking is impossible. In order to use it run with `go build -tags nocgo`. | ||
|
||
package sqlite3 | ||
|
||
import ( | ||
"github.com/jmoiron/sqlx" | ||
) | ||
|
||
type Error struct { | ||
ExtendedCode int | ||
} | ||
|
||
func (Error) Error() string { | ||
panic("Cannot use sqlite3 Error because building with nocgo build tag") | ||
} | ||
|
||
var ErrConstraintUnique int | ||
|
||
func NewDB(env string) (*sqlx.DB, error) { | ||
panic("Cannot use sqlite3 DB because building with nocgo build tag") | ||
} | ||
|
||
func TestDB() (*sqlx.DB, error) { | ||
panic("Cannot use sqlite3 DB because building with nocgo build tag") | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.