Skip to content

resolves #61 - array attributes #104

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.

Sign up for GitHub

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

Merged
steve-r-west merged 2 commits into from
Apr 11, 2022
Merged

resolves #61 - array attributes #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f54b70
resolves #61 - array attributes
epmkelly Apr 11, 2022
7b438f8
build error
epmkelly Apr 11, 2022
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
48 changes: 40 additions & 8 deletions external/completion/completion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"github.com/elasticpath/epcc-cli/external/aliases"
"github.com/elasticpath/epcc-cli/external/resources"
"github.com/spf13/cobra"
"log"
"strconv"
"strings"
)

Expand Down Expand Up @@ -80,26 +82,56 @@ func Complete(c Request) ([]string, cobra.ShellCompDirective) {

if c.Type&CompleteAttributeKey > 0 {
for k := range c.Resource.Attributes {
if _, ok := c.Attributes[k]; !ok {
results = append(results, k)
if strings.Contains(k, "[n]") {
i := strings.Index(k, "[n]")
prefix := k[:i+1]
max := -1
for s := range c.Attributes {
if strings.HasPrefix(s, prefix) {
n := strings.TrimPrefix(s, prefix)
i2 := strings.Index(n, "]")
n = n[:i2]
m, _ := strconv.Atoi(n)
if m > max {
max = m
}
}
}
for j := 0; j <= max+1; j++ {
l := strings.Replace(k, "[n]", "["+strconv.Itoa(j)+"]", 1)
if _, ok := c.Attributes[l]; !ok {
results = append(results, l)
}
}
} else {
if _, ok := c.Attributes[k]; !ok {
results = append(results, k)
}
}
}
}

if c.Type&CompleteAttributeValue > 0 {
if c.Attribute != "" {
if c.Resource.Attributes[c.Attribute].Type == "BOOL" {
attr := c.Attribute
i := strings.Index(attr, "[")
j := strings.Index(attr, "]")
if i != -1 && j != -1 {
attr = attr[:i+1] + "n" + attr[j:]
}
log.Println("here: " + attr)
if c.Resource.Attributes[attr].Type == "BOOL" {
results = append(results, "true", "false")
} else if strings.HasPrefix(c.Resource.Attributes[c.Attribute].Type, "ENUM:") {
enums := strings.Replace(c.Resource.Attributes[c.Attribute].Type, "ENUM:", "", 1)
} else if strings.HasPrefix(c.Resource.Attributes[attr].Type, "ENUM:") {
enums := strings.Replace(c.Resource.Attributes[attr].Type, "ENUM:", "", 1)
for _, k := range strings.Split(enums, ",") {
results = append(results, k)
}
} else if c.Resource.Attributes[c.Attribute].Type == "URL" {
} else if c.Resource.Attributes[attr].Type == "URL" {
results = append(results, "https://")
compDir = compDir | cobra.ShellCompDirectiveNoSpace
} else if strings.HasPrefix(c.Resource.Attributes[c.Attribute].Type, "RESOURCE_ID:") {
resourceType := strings.Replace(c.Resource.Attributes[c.Attribute].Type, "RESOURCE_ID:", "", 1)
} else if strings.HasPrefix(c.Resource.Attributes[attr].Type, "RESOURCE_ID:") {
resourceType := strings.Replace(c.Resource.Attributes[attr].Type, "RESOURCE_ID:", "", 1)

if aliasType, ok := resources.GetResourceByName(resourceType); ok {
for alias := range aliases.GetAliasesForJsonApiType(aliasType.JsonApiType) {
Expand Down
42 changes: 21 additions & 21 deletions external/resources/resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ authentication-realms:
attributes:
name:
type: STRING
redirect_uris[0]:
redirect_uris[n]:
type: URL
duplicate_email_policy:
type: ENUM:allowed,api_only
Expand Down Expand Up @@ -342,15 +342,15 @@ fields:
type: INT
omit_null:
type: BOOL
validation_rules[0].type:
validation_rules[n].type:
type: ENUM:enum,email,slug,between,one-to-many,one-to-one
validation_rules[0].options:
validation_rules[n].options:
type: STRING
validation_rules[0].to:
validation_rules[n].to:
type: STRING
validation_rules[0].options.to:
validation_rules[n].options.to:
type: STRING
validation_rules[0].options.from:
validation_rules[n].options.from:
type: STRING
relationship.flow.data.type:
type: ENUM:flow
Expand Down Expand Up @@ -478,7 +478,7 @@ integrations:
type: ENUM:us-east-2,us-east-1,us-west-1,us-west-2,eu-west-1,eu-west-2
configuration.aws_secret_access_key:
type: STRING
observes[0]:
observes[n]:
type: ENUM:address.created,address.updated,address.deleted,account.created,account.updated,account.deleted,account-member.created,account-member.updated,account-member.deleted,account-membership.created,account-membership.updated,account-membership.deleted,brand.created,brand.updated,brand.deleted,cart.updated,cart.deleted,category.created,category.updated,category.deleted,collection.created,collection.updated,collection.deleted,currency.created,currency.updated,currency.deleted,customer.created,customer.updated,customer.deleted,file.created,file.deleted,integration.created,integration.updated,integration.deleted,order.created,order.updated,order.fulfilled,order.authorized,order.paid,order.refunded,payment-gateway.updated,product.created,product.updated,product.deleted,settings.created,settings.updated,stock-transaction.created,transaction.created,transaction.updated,user-authentication-info.created,user-authentication-info.updated,user-authentication-info.deleted
merchant-realm-mappings:
singular-name: "merchant-realm-mapping"
Expand Down Expand Up @@ -942,11 +942,11 @@ promotion-codes:
url: "/v2/promotions/{promotions}/codes"
content-type: application/json
attributes:
codes[0].code:
codes[n].code:
type: STRING
codes[0].uses:
codes[n].uses:
type: INT
codes[0].user:
codes[n].user:
type: STRING
consume_unit:
type: ENUM:per_item,per_cart
Expand Down Expand Up @@ -983,21 +983,21 @@ promotions:
type: STRING
end:
type: STRING
max_discount_value[0].amount:
max_discount_value[n].amount:
type: INT
max_discount_value[0].currency:
max_discount_value[n].currency:
type: CURRENCY
min_cart_value[0].currency:
min_cart_value[n].currency:
type: CURRENCY
min_cart_value[0].amount:
min_cart_value[n].amount:
type: INT
max_applications_per_cart:
type: INT
schema.currencies[0].currency:
schema.currencies[n].currency:
type: CURRENCY
schema.currencies[0].amount:
schema.currencies[n].amount:
type: INT
schema.exclude.targets[0]:
schema.exclude.targets[n]:
type: STRING
settings:
singular-name: "setting"
Expand All @@ -1018,7 +1018,7 @@ settings:
type: STRING
list_child_products:
type: BOOL
additional_languages[0]:
additional_languages[n]:
type: STRING
calculation_method:
type: ENUM:simple,line
Expand Down Expand Up @@ -1136,11 +1136,11 @@ v2-products:
type: BOOL
description:
type: STRING
price[0].amount:
price[n].amount:
type: INT
price[0].currency:
price[n].currency:
type: CURRENCY
price[0].includes_tax:
price[n].includes_tax:
type: BOOL
status:
type: ENUM:draft,live
Expand Down
Loading