This repository has been archived by the owner on Nov 18, 2021. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cmd/cue: embed packages required for get go checking
Currently, 'cue get go' loads interface types from cmd/cue/cmd/interfaces during initialisation. Go types that satisfy these interface types are then used as special cases for the target CUE definition types - see the complete logic in (*extractor).altType. Given the nature of 'cue get go' (i.e. that we are looking to import CUE definitions from Go code), it is assumed that the command will be run in the context of a main Go module. That is to say, 'go env GOMOD' will be non-empty. The package arguments to 'cue get go' (and their dependencies) will be resolved via the main Go module. Currently, 'cue get go' assumes that the package cuelang.org/go/cmd/cue/cmd/interfaces will be available. That is to say, either cuelang.org/go is the main module or, more likely, that cuelang.org/go is a module dependency of the main module. However, this is an unnecessary restriction and one that is potentially incorrect. After all, the user is using a specific version of cmd/cue - loading a different version of cuelang.org/go seems likely to lead to version-skew related problems. This change switches cmd/cue to instead load cuelang.org/go/cmd/cue/cmd/interfaces via a simple embedding of the GoFiles in that package. As part of the same change we surface all loading and type checking errors for either the embedded cuelang.org/go/cmd/cue/cmd/interfaces or the arguments to 'cue get go'. We also migrate the TestGetGo to be a testscript test: cmd/cue/cmd/testdata/script/get_go_types.txt This test encompasses all the checks for the various rules/edge cases of type mappins in 'cue get go', e.g. the mapping of certain Go types to _ or string. We also introduce more basic tests that verify the behaviour of 'cue get go' when given a main module package, as well as a non-main module package (a dependency that should already be resolvable via the main Go module). Note: it doesn't seem worth adding/testing GOPATH support given that modules will be GA in Go 1.16. Indeed we have not had explicit GOPATH tests for some time/ever. This change also signifies an end to our support for GOPATH - if it works it will be by accident. In a later change we will enforce the entirely reasonable requirement that the main Go module (which we are using to resolve the arguments to 'cue get go') and the main CUE module into which we are writing the result of 'cue get go' (either within the main module or the cue.mod/pkg directory) are aligned in terms of their module paths. This will allow us to drop the --local flag as part of our renaming 'cue get go' to 'cue import go'. We leave the enforcing of setting GOFLAGS=-mod=readonly whilst loading the arguments to 'cue get go' to a later change. This is preparation towards 'cue import go' but will require a bit more work. With thanks to @verdverm and @NicolasRouquette for the analysis and suggestions that went into this fix. Fixes #621 Change-Id: I630e2cb167c05d63186aa356eaf70a58749b61c5
- Loading branch information