Skip to content

Commit

Permalink
Merge pull request #75 from rigup/build-constraints
Browse files Browse the repository at this point in the history
fixing build constraints
  • Loading branch information
jessesomerville authored May 9, 2021
2 parents 57ccf53 + efd4aac commit 33deb67
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 9 deletions.
2 changes: 1 addition & 1 deletion internal/appconfig/arch_util/vars_other.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// +build !darwin, !linux, !amd64
// +build !darwin,!linux,!amd64

package archutil

Expand Down
25 changes: 19 additions & 6 deletions pkg/options/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,26 @@ var (

// Flag names and shorthands.
var (
FormatFlag = flagName{"format", "f"}
ProjectFlag = flagName{"project", "p"}
ReasonFlag = flagName{"reason", "R"}
RegionFlag = flagName{"region", "r"}
// FormatFlag controls the output format for a command.
FormatFlag = flagName{"format", "f"}

// ProjectFlag sets the GCP project to use for a command.
ProjectFlag = flagName{"project", "p"}

// ReasonFlag enforces that a rationale be given for a command.
ReasonFlag = flagName{"reason", "R"}

// RegionFlag sets the GCP region to use for a command.
RegionFlag = flagName{"region", "r"}

// ServiceAccountEmailFlag sets the service account to use for a command.
ServiceAccountEmailFlag = flagName{"service-account-email", "s"}
YesFlag = flagName{"yes", "y"}
ZoneFlag = flagName{"zone", "z"}

// YesFlag is a boolean that when set to true ignores non-required user prompts.
YesFlag = flagName{"yes", "y"}

// ZoneFlag sets the GCP zone to use for a command.
ZoneFlag = flagName{"zone", "z"}
)

type flagName struct {
Expand Down
9 changes: 7 additions & 2 deletions pkg/options/query_perm.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,14 @@ import (

// Flag names and shorthands.
var (
// ComputeInstanceFlag sets the compute instance to use for a command.
ComputeInstanceFlag = flagName{"instance", "i"}
PubSubTopicFlag = flagName{"topic", "t"}
StorageBucketFlag = flagName{"bucket", "b"}

// PubSubTopicFlag sets the Pub/Sub topic to use for a command.
PubSubTopicFlag = flagName{"topic", "t"}

// StorageBucketFlag sets the GCS bucket to use for a command.
StorageBucketFlag = flagName{"bucket", "b"}
)

// AddComputeInstanceFlag adds the --instance/-i flag to the command.
Expand Down

0 comments on commit 33deb67

Please sign in to comment.