Merge pull request #13 from Financial-Times/renaming-repo_content-unr…

…oller

Renaming repo to content-unroller

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2
 jobs:
   build:
-    working_directory: /go/src/github.com/Financial-Times/image-resolver
+    working_directory: /go/src/github.com/Financial-Times/content-unroller
     docker:
       - image: circleci/golang:1.10
         environment:
@@ -35,7 +35,7 @@ jobs:
       - store_test_results:
           path: /tmp/test-results
   dockerfile:
-    working_directory: /image-resolver
+    working_directory: /content-unroller
     docker:
       - image: docker:18.03
     steps:

.gitignore

@@ -3,4 +3,4 @@
 vendor/*/
 .vscode
 .project
-/image-resolver*
+/content-unroller*

Dockerfile

@@ -1,6 +1,6 @@
 FROM golang:1.10-alpine
 
-ENV PROJECT="image-resolver"
+ENV PROJECT="content-unroller"
 
 # Include code
 ENV ORG_PATH="github.com/Financial-Times"
@@ -30,4 +30,4 @@ WORKDIR /
 COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=0 /artifacts/* /
 
-CMD ["/image-resolver"]
+CMD ["/content-unroller"]

Gopkg.toml

@@ -24,11 +24,6 @@
 #   go-tests = true
 #   unused-packages = true
 
-
-[[constraint]]
-  name = "github.com/Financial-Times/base-ft-rw-app-go"
-  version = "1.0.3"
-
 [[constraint]]
   name = "github.com/Financial-Times/go-fthealth"
   version = "0.5.0"

README.md

@@ -1,5 +1,5 @@
-[![CircleCI](https://circleci.com/gh/Financial-Times/image-resolver/tree/master.png?style=shield)](https://circleci.com/gh/Financial-Times/image-resolver/tree/master)
-[![Coverage Status](https://coveralls.io/repos/github/Financial-Times/image-resolver/badge.svg)](https://coveralls.io/github/Financial-Times/image-resolver)
+[![CircleCI](https://circleci.com/gh/Financial-Times/content-unroller.svg?style=svg)](https://circleci.com/gh/Financial-Times/content-unroller)
+[![Coverage Status](https://coveralls.io/repos/github/Financial-Times/content-unroller/badge.svg?branch=master)](https://coveralls.io/github/Financial-Times/content-unroller?branch=master)
 # content-unroller
 
 Content unroller is an internally used API for expanding images and dynamic content of an article. It receives an article and returns the same article with some additional data:
@@ -17,8 +17,9 @@ Content unroller is an internally used API for expanding images and dynamic cont
 ## Running locally
 To run the service locally, you will need to run the following commands first to get the vendored dependencies for this project:
   ```
-  go get github.com/kardianos/govendor
-  govendor sync
+  dep ensure -vendor-only
+  go test ./... -race
+  go install
   ```
 
 ## Usage

helm/image-resolver/Chart.yaml → helm/content-unroller/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
-description: image-resolver Helm chart for Kubernetes
-name: image-resolver
+description: content-unroller Helm chart for Kubernetes
+name: content-unroller
 version: 0.0.0  # this entry can be left untouched as it is automatically handled by Jenkins pipeline

helm/image-resolver/values.yaml → helm/content-unroller/values.yaml

@@ -1,12 +1,12 @@
-# Default values for image-resolver.
+# Default values for content-unroller.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 service:
   name: "" # The name of the service, should be defined in the specific app-configs folder.
   hasHealthcheck: "true"
 replicaCount: 2
 image:
-  repository: coco/image-resolver
+  repository: coco/content-unroller
   pullPolicy: IfNotPresent
 resources:
   requests:

main.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"time"
 
+	"github.com/Financial-Times/content-unroller/content"
 	fthealth "github.com/Financial-Times/go-fthealth/v1_1"
-	"github.com/Financial-Times/image-resolver/content"
 	"github.com/Financial-Times/service-status-go/gtg"
 	"github.com/Financial-Times/service-status-go/httphandlers"
 	"github.com/gorilla/handlers"
@@ -18,9 +18,9 @@ import (
 )
 
 const (
-	AppCode = "image-resolver"
-	AppName = "Image Resolver"
-	AppDesc = "Image Resolver - unroll images and dynamic content for a given content"
+	AppCode = "content-unroller"
+	AppName = "Content Unroller"
+	AppDesc = "Content Unroller - unroll images and dynamic content for a given content"
 )
 
 func main() {

main_test.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Financial-Times/image-resolver/content"
+	"github.com/Financial-Times/content-unroller/content"
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"