2d3ee06ecd
This changeset performs the following: - Updates `masterzen/winrm` vendor to include change from (https://github.com/masterzen/winrm/pull/73). - Removes `masterzen/xmlpath` dependency, as it is licensed under the LGPL license. - Updates `dylanmei/winrmtest` vendor to include change from (https://github.com/dylanmei/winrmtest/pull/4). - Updates `packer-community/winrmcp` vendor to include the removal of the `masterzen/winrm/winrm` sub-class as a result of the `winrm` CLI tool being removed from the `masterzen/winrm` repository. - Updates nested dependencies as a result of the above vendor changes. - Refactors `parallels/driver_9` to use `goxpath` instead of `xmlpath`, as `xmlpath` is licensed under LGPL. - Adds a basic unit test for the refactor work in `parallels/driver_9` to confirm functionality. This should completely remove any LGPL licensed dependencies inside of the Packer project. ``` $ make test /home/jake/src/go/src/github.com/hashicorp/packer/scripts/gofmtcheck.sh $(find . -not -path "./vendor/*" -name "*.go") ==> Checking that code complies with gofmt requirements... Check passed. ok github.com/hashicorp/packer 0.044s ok github.com/hashicorp/packer/builder/alicloud/ecs 0.055s ok github.com/hashicorp/packer/builder/amazon/chroot 0.040s ok github.com/hashicorp/packer/builder/amazon/common 0.021s ok github.com/hashicorp/packer/builder/amazon/ebs 0.016s ok github.com/hashicorp/packer/builder/amazon/ebssurrogate 0.015s ok github.com/hashicorp/packer/builder/amazon/ebsvolume 0.014s ok github.com/hashicorp/packer/builder/amazon/instance 0.058s ok github.com/hashicorp/packer/builder/azure/arm 2.833s ok github.com/hashicorp/packer/builder/azure/common 0.018s ? github.com/hashicorp/packer/builder/azure/common/constants [no test files] ? github.com/hashicorp/packer/builder/azure/common/lin [no test files] ? github.com/hashicorp/packer/builder/azure/common/logutil [no test files] ok github.com/hashicorp/packer/builder/azure/common/template 0.038s ok github.com/hashicorp/packer/builder/azure/pkcs12 0.120s ok github.com/hashicorp/packer/builder/azure/pkcs12/rc2 0.020s ok github.com/hashicorp/packer/builder/cloudstack 0.038s ok github.com/hashicorp/packer/builder/digitalocean 0.015s ok github.com/hashicorp/packer/builder/docker 0.028s ok github.com/hashicorp/packer/builder/file 0.029s ok github.com/hashicorp/packer/builder/googlecompute 3.162s ok github.com/hashicorp/packer/builder/hyperv/common 0.006s ok github.com/hashicorp/packer/builder/hyperv/iso 0.042s ok github.com/hashicorp/packer/builder/null 0.018s ok github.com/hashicorp/packer/builder/oneandone 0.022s ok github.com/hashicorp/packer/builder/openstack 0.052s ok github.com/hashicorp/packer/builder/parallels/common 2.549s ok github.com/hashicorp/packer/builder/parallels/iso 0.050s ok github.com/hashicorp/packer/builder/parallels/pvm 0.033s ok github.com/hashicorp/packer/builder/profitbricks 0.023s ok github.com/hashicorp/packer/builder/qemu 0.039s ok github.com/hashicorp/packer/builder/triton 0.018s ok github.com/hashicorp/packer/builder/virtualbox/common 5.533s ok github.com/hashicorp/packer/builder/virtualbox/iso 0.044s ok github.com/hashicorp/packer/builder/virtualbox/ovf 0.012s ok github.com/hashicorp/packer/builder/vmware/common 5.325s ok github.com/hashicorp/packer/builder/vmware/iso 0.076s ok github.com/hashicorp/packer/builder/vmware/vmx 0.010s ok github.com/hashicorp/packer/command 0.062s ok github.com/hashicorp/packer/common 0.053s ok github.com/hashicorp/packer/common/json 0.003s [no tests to run] ok github.com/hashicorp/packer/common/powershell 0.015s ? github.com/hashicorp/packer/common/powershell/hyperv [no test files] ? github.com/hashicorp/packer/common/ssh [no test files] ok github.com/hashicorp/packer/common/uuid 0.010s ok github.com/hashicorp/packer/communicator/none 0.008s ok github.com/hashicorp/packer/communicator/ssh 0.068s ok github.com/hashicorp/packer/communicator/winrm 0.046s ok github.com/hashicorp/packer/fix 0.005s ok github.com/hashicorp/packer/helper/builder/testing 0.007s ok github.com/hashicorp/packer/helper/communicator 0.013s ok github.com/hashicorp/packer/helper/config 0.004s ? github.com/hashicorp/packer/helper/enumflag [no test files] ok github.com/hashicorp/packer/helper/flag-kv 0.009s ok github.com/hashicorp/packer/helper/flag-slice 0.006s ok github.com/hashicorp/packer/packer 0.219s ok github.com/hashicorp/packer/packer/plugin 0.233s ok github.com/hashicorp/packer/packer/rpc 0.141s ok github.com/hashicorp/packer/plugin/example 0.008s [no tests to run] ? github.com/hashicorp/packer/post-processor/alicloud-import [no test files] ? github.com/hashicorp/packer/post-processor/amazon-import [no test files] ok github.com/hashicorp/packer/post-processor/artifice 0.003s [no tests to run] ok github.com/hashicorp/packer/post-processor/atlas 0.018s ok github.com/hashicorp/packer/post-processor/checksum 0.015s ok github.com/hashicorp/packer/post-processor/compress 0.047s ok github.com/hashicorp/packer/post-processor/docker-import 0.012s ok github.com/hashicorp/packer/post-processor/docker-push 0.012s ok github.com/hashicorp/packer/post-processor/docker-save 0.008s ok github.com/hashicorp/packer/post-processor/docker-tag 0.008s ok github.com/hashicorp/packer/post-processor/googlecompute-export 0.015s [no tests to run] ? github.com/hashicorp/packer/post-processor/manifest [no test files] ok github.com/hashicorp/packer/post-processor/shell-local 0.028s ok github.com/hashicorp/packer/post-processor/vagrant 0.030s ok github.com/hashicorp/packer/post-processor/vagrant-cloud 0.028s ok github.com/hashicorp/packer/post-processor/vsphere 0.014s ok github.com/hashicorp/packer/provisioner 0.011s ok github.com/hashicorp/packer/provisioner/ansible 0.140s ok github.com/hashicorp/packer/provisioner/ansible-local 0.056s ok github.com/hashicorp/packer/provisioner/chef-client 0.050s ok github.com/hashicorp/packer/provisioner/chef-solo 0.061s ok github.com/hashicorp/packer/provisioner/converge 0.018s ok github.com/hashicorp/packer/provisioner/file 0.015s ok github.com/hashicorp/packer/provisioner/powershell 0.168s ok github.com/hashicorp/packer/provisioner/puppet-masterless 0.008s ok github.com/hashicorp/packer/provisioner/puppet-server 0.031s ok github.com/hashicorp/packer/provisioner/salt-masterless 0.010s ok github.com/hashicorp/packer/provisioner/shell 0.010s ok github.com/hashicorp/packer/provisioner/shell-local 0.037s ok github.com/hashicorp/packer/provisioner/windows-restart 0.180s ok github.com/hashicorp/packer/provisioner/windows-shell 0.159s ? github.com/hashicorp/packer/scripts [no test files] ok github.com/hashicorp/packer/template 0.008s ok github.com/hashicorp/packer/template/interpolate 0.004s ? github.com/hashicorp/packer/version [no test files] ```
198 lines
5.0 KiB
Go
198 lines
5.0 KiB
Go
// Copyright 2014 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package language
|
|
|
|
import (
|
|
"fmt"
|
|
"sort"
|
|
)
|
|
|
|
// The Coverage interface is used to define the level of coverage of an
|
|
// internationalization service. Note that not all types are supported by all
|
|
// services. As lists may be generated on the fly, it is recommended that users
|
|
// of a Coverage cache the results.
|
|
type Coverage interface {
|
|
// Tags returns the list of supported tags.
|
|
Tags() []Tag
|
|
|
|
// BaseLanguages returns the list of supported base languages.
|
|
BaseLanguages() []Base
|
|
|
|
// Scripts returns the list of supported scripts.
|
|
Scripts() []Script
|
|
|
|
// Regions returns the list of supported regions.
|
|
Regions() []Region
|
|
}
|
|
|
|
var (
|
|
// Supported defines a Coverage that lists all supported subtags. Tags
|
|
// always returns nil.
|
|
Supported Coverage = allSubtags{}
|
|
)
|
|
|
|
// TODO:
|
|
// - Support Variants, numbering systems.
|
|
// - CLDR coverage levels.
|
|
// - Set of common tags defined in this package.
|
|
|
|
type allSubtags struct{}
|
|
|
|
// Regions returns the list of supported regions. As all regions are in a
|
|
// consecutive range, it simply returns a slice of numbers in increasing order.
|
|
// The "undefined" region is not returned.
|
|
func (s allSubtags) Regions() []Region {
|
|
reg := make([]Region, numRegions)
|
|
for i := range reg {
|
|
reg[i] = Region{regionID(i + 1)}
|
|
}
|
|
return reg
|
|
}
|
|
|
|
// Scripts returns the list of supported scripts. As all scripts are in a
|
|
// consecutive range, it simply returns a slice of numbers in increasing order.
|
|
// The "undefined" script is not returned.
|
|
func (s allSubtags) Scripts() []Script {
|
|
scr := make([]Script, numScripts)
|
|
for i := range scr {
|
|
scr[i] = Script{scriptID(i + 1)}
|
|
}
|
|
return scr
|
|
}
|
|
|
|
// BaseLanguages returns the list of all supported base languages. It generates
|
|
// the list by traversing the internal structures.
|
|
func (s allSubtags) BaseLanguages() []Base {
|
|
base := make([]Base, 0, numLanguages)
|
|
for i := 0; i < langNoIndexOffset; i++ {
|
|
// We included "und" already for the value 0.
|
|
if i != nonCanonicalUnd {
|
|
base = append(base, Base{langID(i)})
|
|
}
|
|
}
|
|
i := langNoIndexOffset
|
|
for _, v := range langNoIndex {
|
|
for k := 0; k < 8; k++ {
|
|
if v&1 == 1 {
|
|
base = append(base, Base{langID(i)})
|
|
}
|
|
v >>= 1
|
|
i++
|
|
}
|
|
}
|
|
return base
|
|
}
|
|
|
|
// Tags always returns nil.
|
|
func (s allSubtags) Tags() []Tag {
|
|
return nil
|
|
}
|
|
|
|
// coverage is used used by NewCoverage which is used as a convenient way for
|
|
// creating Coverage implementations for partially defined data. Very often a
|
|
// package will only need to define a subset of slices. coverage provides a
|
|
// convenient way to do this. Moreover, packages using NewCoverage, instead of
|
|
// their own implementation, will not break if later new slice types are added.
|
|
type coverage struct {
|
|
tags func() []Tag
|
|
bases func() []Base
|
|
scripts func() []Script
|
|
regions func() []Region
|
|
}
|
|
|
|
func (s *coverage) Tags() []Tag {
|
|
if s.tags == nil {
|
|
return nil
|
|
}
|
|
return s.tags()
|
|
}
|
|
|
|
// bases implements sort.Interface and is used to sort base languages.
|
|
type bases []Base
|
|
|
|
func (b bases) Len() int {
|
|
return len(b)
|
|
}
|
|
|
|
func (b bases) Swap(i, j int) {
|
|
b[i], b[j] = b[j], b[i]
|
|
}
|
|
|
|
func (b bases) Less(i, j int) bool {
|
|
return b[i].langID < b[j].langID
|
|
}
|
|
|
|
// BaseLanguages returns the result from calling s.bases if it is specified or
|
|
// otherwise derives the set of supported base languages from tags.
|
|
func (s *coverage) BaseLanguages() []Base {
|
|
if s.bases == nil {
|
|
tags := s.Tags()
|
|
if len(tags) == 0 {
|
|
return nil
|
|
}
|
|
a := make([]Base, len(tags))
|
|
for i, t := range tags {
|
|
a[i] = Base{langID(t.lang)}
|
|
}
|
|
sort.Sort(bases(a))
|
|
k := 0
|
|
for i := 1; i < len(a); i++ {
|
|
if a[k] != a[i] {
|
|
k++
|
|
a[k] = a[i]
|
|
}
|
|
}
|
|
return a[:k+1]
|
|
}
|
|
return s.bases()
|
|
}
|
|
|
|
func (s *coverage) Scripts() []Script {
|
|
if s.scripts == nil {
|
|
return nil
|
|
}
|
|
return s.scripts()
|
|
}
|
|
|
|
func (s *coverage) Regions() []Region {
|
|
if s.regions == nil {
|
|
return nil
|
|
}
|
|
return s.regions()
|
|
}
|
|
|
|
// NewCoverage returns a Coverage for the given lists. It is typically used by
|
|
// packages providing internationalization services to define their level of
|
|
// coverage. A list may be of type []T or func() []T, where T is either Tag,
|
|
// Base, Script or Region. The returned Coverage derives the value for Bases
|
|
// from Tags if no func or slice for []Base is specified. For other unspecified
|
|
// types the returned Coverage will return nil for the respective methods.
|
|
func NewCoverage(list ...interface{}) Coverage {
|
|
s := &coverage{}
|
|
for _, x := range list {
|
|
switch v := x.(type) {
|
|
case func() []Base:
|
|
s.bases = v
|
|
case func() []Script:
|
|
s.scripts = v
|
|
case func() []Region:
|
|
s.regions = v
|
|
case func() []Tag:
|
|
s.tags = v
|
|
case []Base:
|
|
s.bases = func() []Base { return v }
|
|
case []Script:
|
|
s.scripts = func() []Script { return v }
|
|
case []Region:
|
|
s.regions = func() []Region { return v }
|
|
case []Tag:
|
|
s.tags = func() []Tag { return v }
|
|
default:
|
|
panic(fmt.Sprintf("language: unsupported set type %T", v))
|
|
}
|
|
}
|
|
return s
|
|
}
|