Support ChirpStack v4 #112
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -24,6 +24,8 @@ import ( | |
|
|
||
| "github.com/spf13/pflag" | ||
| "go.thethings.network/lorawan-stack-migrate/pkg/source" | ||
| "go.thethings.network/lorawan-stack/v3/pkg/fetch" | ||
| "go.thethings.network/lorawan-stack/v3/pkg/frequencyplans" | ||
| "go.thethings.network/lorawan-stack/v3/pkg/types" | ||
| "google.golang.org/grpc" | ||
| "google.golang.org/grpc/credentials" | ||
|
|
@@ -32,96 +34,113 @@ import ( | |
|
|
||
| const dialTimeout = 10 * time.Second | ||
|
|
||
| type Config struct { | ||
| src source.Config | ||
|
|
||
| apiKey, caCertPath, url, joinEUI string | ||
| flags *pflag.FlagSet | ||
| FPStore *frequencyplans.Store | ||
| insecure bool | ||
|
|
||
| ClientConn *grpc.ClientConn | ||
|
|
||
| ExportVars, | ||
| ExportSession bool | ||
| FrequencyPlanID string | ||
| JoinEUI *types.EUI64 | ||
| } | ||
|
|
||
| func New() *Config { | ||
| config := &Config{ | ||
| flags: &pflag.FlagSet{}, | ||
| } | ||
|
|
||
| config.flags.StringVar(&config.url, | ||
| "api-url", | ||
| "", | ||
| "ChirpStack API URL") | ||
| config.flags.StringVar(&config.apiKey, | ||
| "api-key", | ||
| "", | ||
| "ChirpStack API key") | ||
| config.flags.StringVar(&config.caCertPath, | ||
| "ca-cert-path", | ||
| "", | ||
| "(optional) Path to the CA certificate file for ChirpStack API TLS connections") | ||
| config.flags.BoolVar(&config.insecure, | ||
| "insecure", | ||
| false, | ||
| "Do not connect to ChirpStack over TLS") | ||
| config.flags.BoolVar(&config.ExportVars, | ||
| "export-vars", | ||
| false, | ||
| "Export device variables from ChirpStack") | ||
| config.flags.BoolVar(&config.ExportSession, | ||
| "export-session", | ||
| false, | ||
| "Export device session keys from ChirpStack") | ||
| config.flags.StringVar(&config.joinEUI, | ||
| "join-eui", | ||
| "", | ||
| "JoinEUI of exported devices") | ||
| config.flags.StringVar(&config.FrequencyPlanID, | ||
| "frequency-plan-id", | ||
| "", | ||
| "Frequency Plan ID of exported devices") | ||
|
|
||
| return config | ||
| } | ||
|
|
||
| func (c *Config) Initialize(src source.Config) error { | ||
| c.src = src | ||
|
|
||
| if c.apiKey = os.Getenv("CHIRPSTACK_API_KEY"); c.apiKey == "" { | ||
| return errNoAPIToken.New() | ||
| } | ||
| if c.url = os.Getenv("CHIRPSTACK_API_URL"); c.url == "" { | ||
| return errNoAPIURL.New() | ||
| } | ||
| if c.FrequencyPlanID = os.Getenv("FREQUENCY_PLAN_ID"); c.FrequencyPlanID == "" { | ||
| return errNoFrequencyPlan.New() | ||
| } | ||
| if c.joinEUI = os.Getenv("JOIN_EUI"); c.joinEUI == "" { | ||
| return errNoJoinEUI.New() | ||
| } | ||
| c.JoinEUI = &types.EUI64{} | ||
| if err := c.JoinEUI.UnmarshalText([]byte(c.joinEUI)); err != nil { | ||
| return errInvalidJoinEUI.WithAttributes("join_eui", c.joinEUI) | ||
| } | ||
| c.caCertPath = os.Getenv("CHIRPSTACK_CA_CERT_PATH") | ||
|
Contributor
There was a problem hiding this comment. Won't this always override the CLI flags ?
Member
Author
There was a problem hiding this comment. Yes indeed. We do this for all the other sources the same currently. I think we should fix this separately for all the sources.
Contributor
There was a problem hiding this comment. I would like to see this fixed everywhere before we make a new release, as it is very broken. The change itself comes from #97 (comment) , but the idea is that only secrets shouldn't be initialized as flag defaults - the rest of the setup does not need this.
Member
Author
There was a problem hiding this comment. Sounds good to me. I'll file a follow up before we make a release. |
||
| c.insecure = os.Getenv("CHIRPSTACK_INSECURE") == "true" | ||
| c.ExportSession = os.Getenv("EXPORT_SESSION") == "true" | ||
| c.ExportVars = os.Getenv("EXPORT_VARS") == "true" | ||
|
|
||
| err := c.dialGRPC( | ||
| grpc.FailOnNonTempDialError(true), | ||
| grpc.WithBlock(), | ||
| grpc.WithPerRPCCredentials(token(c.apiKey)), | ||
| ) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| fpFetcher, err := fetch.FromHTTP(http.DefaultClient, src.FrequencyPlansURL) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| c.FPStore = frequencyplans.NewStore(fpFetcher) | ||
| return nil | ||
| } | ||
|
|
||
| // Flags returns the flags for the configuration. | ||
| func (c *Config) Flags() *pflag.FlagSet { | ||
| return c.flags | ||
| } | ||
|
|
||
| func (c *Config) dialGRPC(opts ...grpc.DialOption) error { | ||
| if c.insecure { | ||
| opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials())) | ||
| } else { | ||
| tlsConfig, err := generateTLSConfig(c.caCertPath) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
This file contains hidden or 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 hidden or 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
Oops, something went wrong.
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.
This is a mistake in the current (released) changelog that's fixed.