+
Skip to content
This repository was archived by the owner on Sep 28, 2021. It is now read-only.

Allow insecure connections (self signed cert) #463

Merged
merged 13 commits into from
Dec 9, 2019
Merged

Allow insecure connections (self signed cert) #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8286aac
Allow insecure connections (self signed cert)
axelssonHakan Nov 27, 2019
65f4974
Fix unittest
axelssonHakan Nov 27, 2019
92125ae
Update doc
axelssonHakan Nov 27, 2019
ac5c85b
Update API spec
axelssonHakan Nov 27, 2019
2185e29
Bump API version
axelssonHakan Nov 27, 2019
7df58b4
Reset version
axelssonHakan Nov 27, 2019
9a42970
Allow for slash in engine URL
axelssonHakan Nov 27, 2019
bcc274c
Update unittest
axelssonHakan Nov 27, 2019
81bd522
Merge branch 'master' into enableInsecureConnection
glooms Dec 2, 2019
58a9d34
Rename flag
axelssonHakan Dec 4, 2019
907b302
Update golden files used for test
axelssonHakan Dec 4, 2019
39a64d7
Merge branch 'master' into enableInsecureConnection
axelssonHakan Dec 9, 2019
29c3d4d
Merge branch 'master' into enableInsecureConnection
axelssonHakan Dec 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/alternate_state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var listAlternateStatesCmd = withLocalFlags(&cobra.Command{
Example: "corectl state ls",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
items := internal.ListAlternateStates(state.Ctx, state.Doc)
printer.PrintStates(items, viper.GetBool("bash"))
},
Expand All @@ -34,7 +34,7 @@ var addAlternateStateCmd = &cobra.Command{
if stateName == "" {
log.Fatalln("no state name specified")
}
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
internal.AddAlternateState(state.Ctx, state.Doc, stateName)
if !viper.GetBool("no-save") {
internal.Save(rootCtx, state.Doc)
Expand All @@ -54,7 +54,7 @@ var removeAlternateStateCmd = &cobra.Command{
if stateName == "" {
log.Fatalln("no state name specified")
}
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
internal.RemoveAlternateState(state.Ctx, state.Doc, stateName)
if !viper.GetBool("no-save") {
internal.Save(rootCtx, state.Doc)
Expand Down
26 changes: 13 additions & 13 deletions cmd/analyze.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ var getAssociationsCmd = &cobra.Command{
corectl associations`,

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
engine := internal.GetEngineURL()
data := internal.GetModelMetadata(rootCtx, state.Doc, state.AppID, engine, headers, certificates, false)
data := internal.GetModelMetadata(rootCtx, state.Doc, state.AppID, engine, headers, tlsClientConfig, false)
printer.PrintAssociations(data)
},
}
Expand All @@ -37,9 +37,9 @@ var getTablesCmd = &cobra.Command{
corectl tables --app=my-app.qvf`,

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
engine := internal.GetEngineURL()
data := internal.GetModelMetadata(rootCtx, state.Doc, state.AppID, engine, headers, certificates, false)
data := internal.GetModelMetadata(rootCtx, state.Doc, state.AppID, engine, headers, tlsClientConfig, false)
printer.PrintTables(data)
},
}
Expand All @@ -53,9 +53,9 @@ var getMetaCmd = &cobra.Command{
corectl meta --app my-app.qvf`,

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
engine := internal.GetEngineURL()
data := internal.GetModelMetadata(rootCtx, state.Doc, state.AppID, engine, headers, certificates, false)
data := internal.GetModelMetadata(rootCtx, state.Doc, state.AppID, engine, headers, tlsClientConfig, false)
printer.PrintMetadata(data)
},
}
Expand All @@ -68,7 +68,7 @@ var getValuesCmd = &cobra.Command{
Example: "corectl values FIELD",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
internal.PrintFieldValues(rootCtx, state.Doc, args[0])
},
}
Expand All @@ -81,9 +81,9 @@ var getFieldsCmd = withLocalFlags(&cobra.Command{
Example: "corectl fields",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
engine := internal.GetEngineURL()
data := internal.GetModelMetadata(rootCtx, state.Doc, state.AppID, engine, headers, certificates, false)
data := internal.GetModelMetadata(rootCtx, state.Doc, state.AppID, engine, headers, tlsClientConfig, false)
printer.PrintFields(data, false)
},
}, "quiet")
Expand All @@ -96,9 +96,9 @@ var getKeysCmd = &cobra.Command{
Example: "corectl keys",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
engine := internal.GetEngineURL()
data := internal.GetModelMetadata(rootCtx, state.Doc, state.AppID, engine, headers, certificates, false)
data := internal.GetModelMetadata(rootCtx, state.Doc, state.AppID, engine, headers, tlsClientConfig, false)
printer.PrintFields(data, true)
},
}
Expand All @@ -114,7 +114,7 @@ corectl eval "Avg(Sales)" by "Region" // returns the average of measure "Sales"
corectl eval by "Region" // Returns the values for dimension "Region"`,

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
internal.Eval(rootCtx, state.Doc, args)
},
}
Expand Down Expand Up @@ -144,7 +144,7 @@ corectl catwalk --app my-app.qvf --catwalk-url http://localhost:8080`,
catwalkURL += "?engine_url=" + engineURL.String()
}
if appSpecified {
if ok, err := internal.AppExists(rootCtx, engine, appID, headers, certificates); !ok {
if ok, err := internal.AppExists(rootCtx, engine, appID, headers, tlsClientConfig); !ok {
log.Fatalln(err)
}
}
Expand Down
8 changes: 4 additions & 4 deletions cmd/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var listAppsCmd = withLocalFlags(&cobra.Command{
Example: "corectl app ls",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, true)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, true)
docList, err := state.Global.GetDocList(rootCtx)
if err != nil {
log.Fatalf("could not retrieve app list: %s\n", err)
Expand All @@ -38,13 +38,13 @@ var removeAppCmd = withLocalFlags(&cobra.Command{
Run: func(ccmd *cobra.Command, args []string) {
app := args[0]

if ok, err := internal.AppExists(rootCtx, viper.GetString("engine"), app, headers, certificates); !ok {
if ok, err := internal.AppExists(rootCtx, viper.GetString("engine"), app, headers, tlsClientConfig); !ok {
log.Fatalln(err)
}
confirmed := askForConfirmation(fmt.Sprintf("Do you really want to delete the app: %s?", app))

if confirmed {
internal.DeleteApp(rootCtx, viper.GetString("engine"), app, headers, certificates)
internal.DeleteApp(rootCtx, viper.GetString("engine"), app, headers, tlsClientConfig)
}
},
}, "suppress")
Expand All @@ -62,7 +62,7 @@ var importAppCmd = withLocalFlags(&cobra.Command{
Run: func(ccmd *cobra.Command, args []string) {
appPath := args[0]
engine := internal.GetEngineURL()
appID, appName, err := rest.ImportApp(appPath, engine, headers, certificates)
appID, appName, err := rest.ImportApp(appPath, engine, headers, tlsClientConfig)
if err != nil {
log.Fatalln(err)
}
Expand Down
10 changes: 5 additions & 5 deletions cmd/bookmark.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var setBookmarksCmd = withLocalFlags(&cobra.Command{
if commandLineBookmarks == "" {
log.Fatalln("no bookmarks specified")
}
state := internal.PrepareEngineState(rootCtx, headers, certificates, true, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, true, false)
internal.SetBookmarks(rootCtx, state.Doc, commandLineBookmarks)
if !viper.GetBool("no-save") {
internal.Save(rootCtx, state.Doc)
Expand All @@ -37,7 +37,7 @@ var removeBookmarkCmd = withLocalFlags(&cobra.Command{
Example: "corectl dimension rm ID-1",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
for _, entity := range args {
destroyed, err := state.Doc.DestroyBookmark(rootCtx, entity)
if err != nil {
Expand All @@ -60,7 +60,7 @@ var listBookmarksCmd = &cobra.Command{
Example: "corectl bookmark ls",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
items := internal.ListBookmarks(state.Ctx, state.Doc)
printer.PrintNamedItemsList(items, viper.GetBool("bash"), false)
},
Expand All @@ -74,7 +74,7 @@ var getBookmarkPropertiesCmd = withLocalFlags(&cobra.Command{
Example: "corectl bookmark properties BOOKMARK-ID",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
printer.PrintGenericEntityProperties(state, args[0], "bookmark", viper.GetBool("minimum"))
},
}, "minimum")
Expand All @@ -87,7 +87,7 @@ var getBookmarkLayoutCmd = &cobra.Command{
Example: "corectl bBookmark layout BOOKMARK-ID",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
printer.PrintGenericEntityLayout(state, args[0], "bookmark")
},
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ corectl build --connections ./myconnections.yml --script ./myscript.qvs`,

Run: func(ccmd *cobra.Command, args []string) {
ctx := rootCtx
state := internal.PrepareEngineState(ctx, headers, certificates, true, false)
state := internal.PrepareEngineState(ctx, headers, tlsClientConfig, true, false)

separateConnectionsFile := ccmd.Flag("connections").Value.String()
if separateConnectionsFile == "" {
Expand Down Expand Up @@ -60,7 +60,7 @@ var reloadCmd = withLocalFlags(&cobra.Command{
},

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
silent := viper.GetBool("silent")
limit := viper.GetInt("limit")

Expand Down
8 changes: 4 additions & 4 deletions cmd/connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var setConnectionsCmd = &cobra.Command{
Example: "corectl connection set ./my-connections.yml",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, true, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, true, false)
separateConnectionsFile := args[0]
if separateConnectionsFile == "" {
log.Fatalln("no connections config file specified")
Expand All @@ -38,7 +38,7 @@ corectl connection rm ID-1
corectl connection rm ID-1 ID-2`,

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
for _, connection := range args {
err := state.Doc.DeleteConnection(rootCtx, connection)
if err != nil {
Expand All @@ -59,7 +59,7 @@ var listConnectionsCmd = withLocalFlags(&cobra.Command{
Example: "corectl connection ls",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
connections, err := state.Doc.GetConnections(rootCtx)
if err != nil {
log.Fatalf("could not retrieve list of connections: %s\n", err)
Expand All @@ -76,7 +76,7 @@ var getConnectionCmd = &cobra.Command{
Example: "corectl connection get CONNECTION-ID",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
connection, err := state.Doc.GetConnection(rootCtx, args[0])
if err != nil {
log.Fatalf("could not retrieve connection '%s': %s\n", args[0], err)
Expand Down
10 changes: 5 additions & 5 deletions cmd/dimension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var setDimensionsCmd = withLocalFlags(&cobra.Command{
if commandLineDimensions == "" {
log.Fatalln("no dimensions specified")
}
state := internal.PrepareEngineState(rootCtx, headers, certificates, true, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, true, false)
internal.SetDimensions(rootCtx, state.Doc, commandLineDimensions)
if !viper.GetBool("no-save") {
internal.Save(rootCtx, state.Doc)
Expand All @@ -36,7 +36,7 @@ var removeDimensionCmd = withLocalFlags(&cobra.Command{
Example: "corectl dimension rm ID-1",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
for _, entity := range args {
destroyed, err := state.Doc.DestroyDimension(rootCtx, entity)
if err != nil {
Expand All @@ -59,7 +59,7 @@ var listDimensionsCmd = withLocalFlags(&cobra.Command{
Example: "corectl dimension ls",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
items := internal.ListDimensions(state.Ctx, state.Doc)
printer.PrintNamedItemsList(items, viper.GetBool("bash"), false)
},
Expand All @@ -73,7 +73,7 @@ var getDimensionPropertiesCmd = withLocalFlags(&cobra.Command{
Example: "corectl dimension properties DIMENSION-ID",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
printer.PrintGenericEntityProperties(state, args[0], "dimension", viper.GetBool("minimum"))
},
}, "minimum")
Expand All @@ -86,7 +86,7 @@ var getDimensionLayoutCmd = &cobra.Command{
Example: "corectl dimension layout DIMENSION-ID",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
printer.PrintGenericEntityLayout(state, args[0], "dimension")
},
}
Expand Down
3 changes: 2 additions & 1 deletion cmd/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
var localFlags pflag.FlagSet
var initialized bool

// Default placeholder for unbuild folder location
// DefaultUnbuildFolder is the placeholder for unbuild folder location
var DefaultUnbuildFolder = "./<app name>-unbuild"

// getPathFlagFromConfigFile returns a parameter from the config file.
Expand Down Expand Up @@ -55,6 +55,7 @@ func initGlobalFlags(globalFlags *pflag.FlagSet) {
globalFlags.Bool("bash", false, "Bash flag used to adapt output to bash completion format")
globalFlags.MarkHidden("bash")
globalFlags.String("context", "", "Name of the context used when connecting to Qlik Associative Engine")
globalFlags.Bool("insecure", false, "Enabling insecure will make it possible to connect using self signed certificates")

globalFlags.VisitAll(func(flag *pflag.Flag) {
viper.BindPFlag(flag.Name, flag)
Expand Down
10 changes: 5 additions & 5 deletions cmd/measure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var setMeasuresCmd = withLocalFlags(&cobra.Command{
if commandLineMeasures == "" {
log.Fatalln("no measures specified")
}
state := internal.PrepareEngineState(rootCtx, headers, certificates, true, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, true, false)
internal.SetMeasures(rootCtx, state.Doc, commandLineMeasures)
if !viper.GetBool("no-save") {
internal.Save(rootCtx, state.Doc)
Expand All @@ -36,7 +36,7 @@ var removeMeasureCmd = withLocalFlags(&cobra.Command{
Example: "corectl measure rm ID-1 ID-2",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
for _, entity := range args {
destroyed, err := state.Doc.DestroyMeasure(rootCtx, entity)
if err != nil {
Expand All @@ -59,7 +59,7 @@ var listMeasuresCmd = withLocalFlags(&cobra.Command{
Example: "corectl measure ls",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
items := internal.ListMeasures(state.Ctx, state.Doc)
printer.PrintNamedItemsList(items, viper.GetBool("bash"), false)
},
Expand All @@ -73,7 +73,7 @@ var getMeasurePropertiesCmd = withLocalFlags(&cobra.Command{
Example: "corectl measure properties MEASURE-ID",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
printer.PrintGenericEntityProperties(state, args[0], "measure", viper.GetBool("minimum"))
},
}, "minimum")
Expand All @@ -86,7 +86,7 @@ var getMeasureLayoutCmd = &cobra.Command{
Example: "corectl measure layout MEASURE-ID",

Run: func(ccmd *cobra.Command, args []string) {
state := internal.PrepareEngineState(rootCtx, headers, certificates, false, false)
state := internal.PrepareEngineState(rootCtx, headers, tlsClientConfig, false, false)
printer.PrintGenericEntityLayout(state, args[0], "measure")
},
}
Expand Down
Loading
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载