Skip to content

Commit

Permalink
Merge pull request #81 from aztfmod/feb-cleanup
Browse files Browse the repository at this point in the history
Feb cleanup
  • Loading branch information
Nepomuceno authored Feb 4, 2021
2 parents 57bba42 + c52c7f3 commit 5047d01
Show file tree
Hide file tree
Showing 17 changed files with 665 additions and 558 deletions.
45 changes: 23 additions & 22 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------

FROM golang:1.14.4 as base
FROM golang:1.15 as base

# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -34,26 +34,26 @@ RUN apt-get update \
&& cd /tmp/gotools \
&& GO111MODULE=on go get -v golang.org/x/tools/gopls@latest 2>&1 \
&& GO111MODULE=on go get -v \
honnef.co/go/tools/...@latest \
golang.org/x/tools/cmd/gorename@latest \
golang.org/x/tools/cmd/goimports@latest \
golang.org/x/tools/cmd/guru@latest \
golang.org/x/lint/golint@latest \
github.com/mdempsky/gocode@latest \
github.com/cweill/gotests/...@latest \
github.com/haya14busa/goplay/cmd/goplay@latest \
github.com/sqs/goreturns@latest \
github.com/josharian/impl@latest \
github.com/davidrjenni/reftools/cmd/fillstruct@latest \
github.com/uudashr/gopkgs/v2/cmd/gopkgs \
github.com/ramya-rao-a/go-outline@latest \
github.com/acroca/go-symbols@latest \
github.com/godoctor/godoctor@latest \
github.com/rogpeppe/godef@latest \
github.com/zmb3/gogetdoc@latest \
github.com/fatih/gomodifytags@latest \
github.com/mgechev/revive@latest \
github.com/go-delve/delve/cmd/dlv@latest 2>&1 \
honnef.co/go/tools/...@latest \
golang.org/x/tools/cmd/gorename@latest \
golang.org/x/tools/cmd/goimports@latest \
golang.org/x/tools/cmd/guru@latest \
golang.org/x/lint/golint@latest \
github.com/mdempsky/gocode@latest \
github.com/cweill/gotests/...@latest \
github.com/haya14busa/goplay/cmd/goplay@latest \
github.com/sqs/goreturns@latest \
github.com/josharian/impl@latest \
github.com/davidrjenni/reftools/cmd/fillstruct@latest \
github.com/uudashr/gopkgs/v2/cmd/gopkgs \
github.com/ramya-rao-a/go-outline@latest \
github.com/acroca/go-symbols@latest \
github.com/godoctor/godoctor@latest \
github.com/rogpeppe/godef@latest \
github.com/zmb3/gogetdoc@latest \
github.com/fatih/gomodifytags@latest \
github.com/mgechev/revive@latest \
github.com/go-delve/delve/cmd/dlv@latest 2>&1 \
#
# Install Go tools w/o module support
# && go get -v github.com/alecthomas/gometalinter 2>&1 \
Expand Down Expand Up @@ -92,7 +92,7 @@ ENV DEBIAN_FRONTEND=dialog
# Add terraform
FROM base

ENV versionTerraform=0.12.28
ENV versionTerraform=0.14.5

RUN apt-get update \
&& apt-get -y install \
Expand All @@ -103,3 +103,4 @@ RUN apt-get update \
unzip -d /usr/local/bin /tmp/terraform.zip \
&& mkdir -p /root/.terraform.d/plugins

RUN go get github.com/bflad/tfproviderlint/cmd/tfproviderlint
31 changes: 13 additions & 18 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,32 @@
{
"name": "Go",
"dockerFile": "Dockerfile",
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
"seccomp=unconfined",
"--mount", "type=volume,source=shell,destination=/root",
"--mount", "type=volume,source=go,destination=/go",
"--mount",
"type=volume,source=shell,destination=/root",
"--mount",
"type=volume,source=go,destination=/go",
// "--mount", "type=bind,source=${HOME}/.ssh,destination=/tmp/.ssh-localhost,readonly"
],

"mounts": [
"source=${localEnv:HOME}${localEnv:USERPROFILE}/.ssh,target=/tmp/.ssh-localhost,type=bind,consistency=cached"
],

// Set *default* container specific settings.json values on container create.
"settings": {
"settings": {
"terminal.integrated.shell.linux": "/bin/bash",
"go.gopath": "/go"
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.

"postCreateCommand": "cp -R /tmp/.ssh-localhost/* ~/.ssh && chmod 700 ~/.ssh && chmod 600 ~/.ssh/*",

"postCreateCommand": "cp -R /tmp/.ssh-localhost/* ~/.ssh && chmod 700 ~/.ssh && chmod 600 ~/.ssh/*",
// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
// "remoteUser": "vscode"

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-vscode.go"
]
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-vscode.go"
]
}
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,9 @@ This is the current compreheensive status of the implemented resources in the pr
|azurerm_frontdoor ||
|azurerm_frontdoor_custom_https_configuration ||
|azurerm_frontdoor_firewall_policy ||
|azurerm_function_app | |
|azurerm_function_app | |
|azurerm_function_app_host_keys ||
|azurerm_function_app_slot | |
|azurerm_function_app_slot | |
|azurerm_hdinsight_cluster ||
|azurerm_hdinsight_hadoop_cluster ||
|azurerm_hdinsight_hbase_cluster ||
Expand All @@ -372,7 +372,7 @@ This is the current compreheensive status of the implemented resources in the pr
|azurerm_hpc_cache_nfs_target ||
|azurerm_image ||
|azurerm_images ||
|azurerm_integration_service_environment | |
|azurerm_integration_service_environment | |
|azurerm_iot_time_series_insights_access_policy ||
|azurerm_iot_time_series_insights_reference_data_set ||
|azurerm_iot_time_series_insights_standard_environment ||
Expand Down Expand Up @@ -430,13 +430,13 @@ This is the current compreheensive status of the implemented resources in the pr
|azurerm_log_analytics_solution ||
|azurerm_log_analytics_storage_insights ||
|azurerm_log_analytics_workspace ||
|azurerm_logic_app_action_custom | |
|azurerm_logic_app_action_http | |
|azurerm_logic_app_integration_account | |
|azurerm_logic_app_trigger_custom | |
|azurerm_logic_app_trigger_http_request | |
|azurerm_logic_app_trigger_recurrence | |
|azurerm_logic_app_workflow | |
|azurerm_logic_app_action_custom | |
|azurerm_logic_app_action_http | |
|azurerm_logic_app_integration_account | |
|azurerm_logic_app_trigger_custom | |
|azurerm_logic_app_trigger_http_request | |
|azurerm_logic_app_trigger_recurrence | |
|azurerm_logic_app_workflow | |
|azurerm_machine_learning_workspace ||
|azurerm_maintenance_assignment_dedicated_host ||
|azurerm_maintenance_assignment_virtual_machine ||
Expand Down
Loading

0 comments on commit 5047d01

Please sign in to comment.