Skip to content

Commit ac8d37b

Browse files
authored
feat!: Remove ZeroMQ MessageBus capability (#210)
* feat!: Remove ZeroMQ MessageBus capability BREAKING CHANGE: ZeroMQ MessageBus capability no longer available Signed-off-by: Marc-Philippe Fuller <[email protected]>
1 parent 939f05d commit ac8d37b

File tree

6 files changed

+12
-28
lines changed

6 files changed

+12
-28
lines changed

Attribution.txt

-3
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@ https://github.com/leodido/go-urn
111111
edgexfoundry/go-mod-messaging (Apache 2.0) https://github.com/edgexfoundry/go-mod-messaging/v3
112112
https://github.com/edgexfoundry/go-mod-messaging/blob/master/LICENSE
113113

114-
pebbe/zmq4 (BSD-2) https://github.com/pebbe/zmq4
115-
https://github.com/pebbe/zmq4/blob/master/LICENSE.txt
116-
117114
golang.org/x/net (Unspecified) https://github.com/golang/net
118115
https://github.com/golang/net/blob/master/LICENSE
119116

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ FROM ${BASE} AS builder
2020
ARG ADD_BUILD_TAGS=""
2121
ARG MAKE="make -e ADD_BUILD_TAGS=$ADD_BUILD_TAGS build"
2222

23-
ARG ALPINE_PKG_BASE="make git openssh-client gcc libc-dev zeromq-dev libsodium-dev"
23+
ARG ALPINE_PKG_BASE="make git openssh-client"
2424
ARG ALPINE_PKG_EXTRA=""
2525

2626
RUN apk add --update --no-cache ${ALPINE_PKG_BASE} ${ALPINE_PKG_EXTRA}
@@ -36,7 +36,7 @@ RUN ${MAKE}
3636
FROM alpine:3.16
3737

3838
# dumb-init needed for injected secure bootstrapping entrypoint script when run in secure mode.
39-
RUN apk add --update --no-cache zeromq dumb-init
39+
RUN apk add --update --no-cache dumb-init
4040

4141
COPY --from=builder /device-snmp-go/cmd /
4242
COPY --from=builder /device-snmp-go/Attribution.txt /

Makefile

+6-18
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
.PHONY: build test unittest lint clean prepare update docker
22

3-
GO=CGO_ENABLED=0 GO111MODULE=on go
4-
GOCGO=CGO_ENABLED=1 GO111MODULE=on go
5-
6-
# see https://shibumi.dev/posts/hardening-executables
7-
CGO_CPPFLAGS="-D_FORTIFY_SOURCE=2"
8-
CGO_CFLAGS="-O2 -pipe -fno-plt"
9-
CGO_CXXFLAGS="-O2 -pipe -fno-plt"
10-
CGO_LDFLAGS="-Wl,-O1,–sort-common,–as-needed,-z,relro,-z,now"
11-
123
MICROSERVICES=cmd/device-snmp
134

145
.PHONY: $(MICROSERVICES)
@@ -27,10 +18,7 @@ VERSION=$(shell cat ./VERSION 2>/dev/null || echo 0.0.0)
2718

2819
GIT_SHA=$(shell git rev-parse HEAD)
2920

30-
CGOFLAGS=-ldflags "-linkmode=external \
31-
-X github.com/edgexfoundry/device-sdk-go/v3/internal/common.SDKVersion=$(SDKVERSION) \
32-
-X github.com/edgexfoundry/device-snmp-go.Version=$(VERSION)" \
33-
-trimpath -mod=readonly -buildmode=pie
21+
GOFLAGS=-ldflags "-X github.com/edgexfoundry/device-snmp-go.Version=$(VERSION)" -trimpath -mod=readonly
3422

3523
build: $(MICROSERVICES)
3624

@@ -41,17 +29,17 @@ tidy:
4129
go mod tidy
4230

4331
cmd/device-snmp:
44-
$(GOCGO) build -tags "$(ADD_BUILD_TAGS)" $(CGOFLAGS) -o $@ ./cmd
32+
CGO_ENABLED=0 go build -tags "$(ADD_BUILD_TAGS)" $(GOFLAGS) -o $@ ./cmd
4533

4634
unittest:
47-
$(GOCGO) test ./... -coverprofile=coverage.out
35+
go test ./... -coverprofile=coverage.out
4836

4937
lint:
5038
@which golangci-lint >/dev/null || echo "WARNING: go linter not installed. To install, run\n curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b \$$(go env GOPATH)/bin v1.46.2"
5139
@if [ "z${ARCH}" = "zx86_64" ] && which golangci-lint >/dev/null ; then golangci-lint run --config .golangci.yml ; else echo "WARNING: Linting skipped (not on x86_64 or linter not installed)"; fi
5240

5341
test: unittest lint
54-
$(GOCGO) vet ./...
42+
go vet ./...
5543
gofmt -l $$(find . -type f -name '*.go'| grep -v "/vendor/")
5644
[ "`gofmt -l $$(find . -type f -name '*.go'| grep -v "/vendor/")`" = "" ]
5745
./bin/test-attribution-txt.sh
@@ -60,7 +48,7 @@ clean:
6048
rm -f $(MICROSERVICES)
6149

6250
update:
63-
$(GO) mod download
51+
go mod download
6452

6553
run:
6654
cd bin && ./edgex-launch.sh
@@ -79,4 +67,4 @@ docker-nats:
7967
make -e ADD_BUILD_TAGS=include_nats_messaging docker
8068

8169
vendor:
82-
$(GO) mod vendor
70+
CGO_ENABLED=0 go mod vendor

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/edgexfoundry/device-snmp-go
33
go 1.18
44

55
require (
6-
github.com/edgexfoundry/device-sdk-go/v3 v3.0.0-dev.5
6+
github.com/edgexfoundry/device-sdk-go/v3 v3.0.0-dev.6
77
github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.2
88
github.com/soniah/gosnmp v1.21.0
99
)

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
4545
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4646
github.com/eclipse/paho.mqtt.golang v1.4.2 h1:66wOzfUHSSI1zamx7jR6yMEI5EuHnT1G6rNA5PM12m4=
4747
github.com/eclipse/paho.mqtt.golang v1.4.2/go.mod h1:JGt0RsEwEX+Xa/agj90YJ9d9DH2b7upDZMK9HRbFvCA=
48-
github.com/edgexfoundry/device-sdk-go/v3 v3.0.0-dev.5 h1:8jvPXdI06yGOH3qw3BgN/xutHVoAgUU+Q946rc89C9w=
49-
github.com/edgexfoundry/device-sdk-go/v3 v3.0.0-dev.5/go.mod h1:9tfeovR5aXyNb4/kB6ymWvwFUYABvjt9vy3UPyEN6qg=
48+
github.com/edgexfoundry/device-sdk-go/v3 v3.0.0-dev.6 h1:4hvEOdtLUjWBqvc9ZpdYLqLhrXzZRwW86RsgWJBmSkQ=
49+
github.com/edgexfoundry/device-sdk-go/v3 v3.0.0-dev.6/go.mod h1:9tfeovR5aXyNb4/kB6ymWvwFUYABvjt9vy3UPyEN6qg=
5050
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.5 h1:3WMWQ0oi++KFrau/e8BOTqgzORCa3G7bLG0w/wO72Io=
5151
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.5/go.mod h1:cGXMUtbbzw+npJpMcFHPlXIN+ZPF71aiimhJ6v8kaSc=
5252
github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2 h1:xp5MsP+qf/fuJxy8fT7k1N+c4j4C6w04qMCBXm6id7o=

snap/snapcraft.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ parts:
6060
after: [metadata]
6161
source: .
6262
plugin: make
63-
build-packages: [git, libzmq3-dev, zip, pkg-config]
64-
stage-packages: [libzmq5]
63+
build-packages: [git, zip, pkg-config]
6564
build-snaps:
6665
- go/1.18/stable
6766
override-build: |

0 commit comments

Comments
 (0)