From 5f6c115582c867e3fa221472a4a3e6c586c53f6e Mon Sep 17 00:00:00 2001 From: Firas Qutishat Date: Tue, 23 Aug 2022 03:06:34 -0400 Subject: [PATCH] chore: remove VCT_CONTEXT_PROVIDER_URL Signed-off-by: Firas Qutishat --- test/bdd/fixtures/contexts/ld-contexts.json | 424 ------------------- test/bdd/fixtures/docker-compose-testver.yml | 19 - test/bdd/fixtures/docker-compose.yml | 20 - 3 files changed, 463 deletions(-) delete mode 100644 test/bdd/fixtures/contexts/ld-contexts.json diff --git a/test/bdd/fixtures/contexts/ld-contexts.json b/test/bdd/fixtures/contexts/ld-contexts.json deleted file mode 100644 index 88faf3b88..000000000 --- a/test/bdd/fixtures/contexts/ld-contexts.json +++ /dev/null @@ -1,424 +0,0 @@ -{ - "documents": [ - { - "url": "https://w3id.org/activityanchors/v1", - "content": { - "@context": { - "@version": 1.1, - "@protected": true, - "AnchorEvent": { - "@id": "https://w3id.org/activityanchors#AnchorEvent", - "@context": { - "@version": 1.1, - "@protected": true, - "id": "@id", - "type": "@type" - } - }, - "AnchorReceipt": { - "@id": "https://w3id.org/activityanchors#AnchorReceipt", - "@context": { - "@version": 1.1, - "@protected": true, - "id": "@id", - "type": "@type" - } - }, - "AnchorCredential": { - "@id": "https://w3id.org/activityanchors#AnchorCredential", - "@context": { - "@version": 1.1, - "@protected": true, - "id": "@id", - "type": "@type" - } - }, - "anchor": "https://w3id.org/activityanchors#anchor", - "profile": "https://w3id.org/activityanchors#profile" - } - } - }, - { - "url": "https://www.w3.org/ns/activitystreams", - "content": { - "@context": { - "@vocab": "_:", - "xsd": "http://www.w3.org/2001/XMLSchema#", - "as": "https://www.w3.org/ns/activitystreams#", - "ldp": "http://www.w3.org/ns/ldp#", - "vcard": "http://www.w3.org/2006/vcard/ns#", - "id": "@id", - "type": "@type", - "Accept": "as:Accept", - "Activity": "as:Activity", - "IntransitiveActivity": "as:IntransitiveActivity", - "Add": "as:Add", - "Announce": "as:Announce", - "Application": "as:Application", - "Arrive": "as:Arrive", - "Article": "as:Article", - "Audio": "as:Audio", - "Block": "as:Block", - "Collection": "as:Collection", - "CollectionPage": "as:CollectionPage", - "Relationship": "as:Relationship", - "Create": "as:Create", - "Delete": "as:Delete", - "Dislike": "as:Dislike", - "Document": "as:Document", - "Event": "as:Event", - "Follow": "as:Follow", - "Flag": "as:Flag", - "Group": "as:Group", - "Ignore": "as:Ignore", - "Image": "as:Image", - "Invite": "as:Invite", - "Join": "as:Join", - "Leave": "as:Leave", - "Like": "as:Like", - "Link": "as:Link", - "Mention": "as:Mention", - "Note": "as:Note", - "Object": "as:Object", - "Offer": "as:Offer", - "OrderedCollection": "as:OrderedCollection", - "OrderedCollectionPage": "as:OrderedCollectionPage", - "Organization": "as:Organization", - "Page": "as:Page", - "Person": "as:Person", - "Place": "as:Place", - "Profile": "as:Profile", - "Question": "as:Question", - "Reject": "as:Reject", - "Remove": "as:Remove", - "Service": "as:Service", - "TentativeAccept": "as:TentativeAccept", - "TentativeReject": "as:TentativeReject", - "Tombstone": "as:Tombstone", - "Undo": "as:Undo", - "Update": "as:Update", - "Video": "as:Video", - "View": "as:View", - "Listen": "as:Listen", - "Read": "as:Read", - "Move": "as:Move", - "Travel": "as:Travel", - "IsFollowing": "as:IsFollowing", - "IsFollowedBy": "as:IsFollowedBy", - "IsContact": "as:IsContact", - "IsMember": "as:IsMember", - "subject": { - "@id": "as:subject", - "@type": "@id" - }, - "relationship": { - "@id": "as:relationship", - "@type": "@id" - }, - "actor": { - "@id": "as:actor", - "@type": "@id" - }, - "attributedTo": { - "@id": "as:attributedTo", - "@type": "@id" - }, - "attachment": { - "@id": "as:attachment", - "@type": "@id" - }, - "bcc": { - "@id": "as:bcc", - "@type": "@id" - }, - "bto": { - "@id": "as:bto", - "@type": "@id" - }, - "cc": { - "@id": "as:cc", - "@type": "@id" - }, - "context": { - "@id": "as:context", - "@type": "@id" - }, - "current": { - "@id": "as:current", - "@type": "@id" - }, - "first": { - "@id": "as:first", - "@type": "@id" - }, - "generator": { - "@id": "as:generator", - "@type": "@id" - }, - "icon": { - "@id": "as:icon", - "@type": "@id" - }, - "image": { - "@id": "as:image", - "@type": "@id" - }, - "inReplyTo": { - "@id": "as:inReplyTo", - "@type": "@id" - }, - "items": { - "@id": "as:items", - "@type": "@id" - }, - "instrument": { - "@id": "as:instrument", - "@type": "@id" - }, - "orderedItems": { - "@id": "as:items", - "@type": "@id", - "@container": "@list" - }, - "last": { - "@id": "as:last", - "@type": "@id" - }, - "location": { - "@id": "as:location", - "@type": "@id" - }, - "next": { - "@id": "as:next", - "@type": "@id" - }, - "object": { - "@id": "as:object", - "@type": "@id" - }, - "oneOf": { - "@id": "as:oneOf", - "@type": "@id" - }, - "anyOf": { - "@id": "as:anyOf", - "@type": "@id" - }, - "closed": { - "@id": "as:closed", - "@type": "xsd:dateTime" - }, - "origin": { - "@id": "as:origin", - "@type": "@id" - }, - "accuracy": { - "@id": "as:accuracy", - "@type": "xsd:float" - }, - "prev": { - "@id": "as:prev", - "@type": "@id" - }, - "preview": { - "@id": "as:preview", - "@type": "@id" - }, - "replies": { - "@id": "as:replies", - "@type": "@id" - }, - "result": { - "@id": "as:result", - "@type": "@id" - }, - "audience": { - "@id": "as:audience", - "@type": "@id" - }, - "partOf": { - "@id": "as:partOf", - "@type": "@id" - }, - "tag": { - "@id": "as:tag", - "@type": "@id" - }, - "target": { - "@id": "as:target", - "@type": "@id" - }, - "to": { - "@id": "as:to", - "@type": "@id" - }, - "url": { - "@id": "as:url", - "@type": "@id" - }, - "altitude": { - "@id": "as:altitude", - "@type": "xsd:float" - }, - "content": "as:content", - "contentMap": { - "@id": "as:content", - "@container": "@language" - }, - "name": "as:name", - "nameMap": { - "@id": "as:name", - "@container": "@language" - }, - "duration": { - "@id": "as:duration", - "@type": "xsd:duration" - }, - "endTime": { - "@id": "as:endTime", - "@type": "xsd:dateTime" - }, - "height": { - "@id": "as:height", - "@type": "xsd:nonNegativeInteger" - }, - "href": { - "@id": "as:href", - "@type": "@id" - }, - "hreflang": "as:hreflang", - "latitude": { - "@id": "as:latitude", - "@type": "xsd:float" - }, - "longitude": { - "@id": "as:longitude", - "@type": "xsd:float" - }, - "mediaType": "as:mediaType", - "published": { - "@id": "as:published", - "@type": "xsd:dateTime" - }, - "radius": { - "@id": "as:radius", - "@type": "xsd:float" - }, - "rel": "as:rel", - "startIndex": { - "@id": "as:startIndex", - "@type": "xsd:nonNegativeInteger" - }, - "startTime": { - "@id": "as:startTime", - "@type": "xsd:dateTime" - }, - "summary": "as:summary", - "summaryMap": { - "@id": "as:summary", - "@container": "@language" - }, - "totalItems": { - "@id": "as:totalItems", - "@type": "xsd:nonNegativeInteger" - }, - "units": "as:units", - "updated": { - "@id": "as:updated", - "@type": "xsd:dateTime" - }, - "width": { - "@id": "as:width", - "@type": "xsd:nonNegativeInteger" - }, - "describes": { - "@id": "as:describes", - "@type": "@id" - }, - "formerType": { - "@id": "as:formerType", - "@type": "@id" - }, - "deleted": { - "@id": "as:deleted", - "@type": "xsd:dateTime" - }, - "inbox": { - "@id": "ldp:inbox", - "@type": "@id" - }, - "outbox": { - "@id": "as:outbox", - "@type": "@id" - }, - "following": { - "@id": "as:following", - "@type": "@id" - }, - "followers": { - "@id": "as:followers", - "@type": "@id" - }, - "streams": { - "@id": "as:streams", - "@type": "@id" - }, - "preferredUsername": "as:preferredUsername", - "endpoints": { - "@id": "as:endpoints", - "@type": "@id" - }, - "uploadMedia": { - "@id": "as:uploadMedia", - "@type": "@id" - }, - "proxyUrl": { - "@id": "as:proxyUrl", - "@type": "@id" - }, - "liked": { - "@id": "as:liked", - "@type": "@id" - }, - "oauthAuthorizationEndpoint": { - "@id": "as:oauthAuthorizationEndpoint", - "@type": "@id" - }, - "oauthTokenEndpoint": { - "@id": "as:oauthTokenEndpoint", - "@type": "@id" - }, - "provideClientKey": { - "@id": "as:provideClientKey", - "@type": "@id" - }, - "signClientKey": { - "@id": "as:signClientKey", - "@type": "@id" - }, - "sharedInbox": { - "@id": "as:sharedInbox", - "@type": "@id" - }, - "Public": { - "@id": "as:Public", - "@type": "@id" - }, - "source": "as:source", - "likes": { - "@id": "as:likes", - "@type": "@id" - }, - "shares": { - "@id": "as:shares", - "@type": "@id" - }, - "alsoKnownAs": { - "@id": "as:alsoKnownAs", - "@type": "@id" - } - } - } - } - ] -} diff --git a/test/bdd/fixtures/docker-compose-testver.yml b/test/bdd/fixtures/docker-compose-testver.yml index cb2a49373..cda7d7853 100644 --- a/test/bdd/fixtures/docker-compose-testver.yml +++ b/test/bdd/fixtures/docker-compose-testver.yml @@ -555,7 +555,6 @@ services: - VCT_DSN=mongodb://mongodb.shared.com:27017 - VCT_DATABASE_PREFIX=vct-db_ - VCT_TLS_CACERTS=/etc/orb/tls/ec-cacert.pem - - VCT_CONTEXT_PROVIDER_URL=https://orb.file-server.com:12096/ld-contexts.json volumes: - ./keys/tls:/etc/orb/tls ports: @@ -632,24 +631,6 @@ services: orb_net: ipv4_address: 172.20.0.20 - orb.file-server.com: # file server for hosting static resources (e.g. JSON-LD contexts) - container_name: orb.file-server.com - image: halverneus/static-file-server:latest - environment: - - PORT=12096 - - FOLDER=/data - - TLS_CERT=/etc/tls/ec-pubCert.pem - - TLS_KEY=/etc/tls/ec-key.pem - - CORS=true - ports: - - 12096:12096 - volumes: - - ./contexts:/data - - ./keys/tls:/etc/tls - networks: - orb_net: - ipv4_address: 172.20.0.22 - networks: orb_net: ipam: diff --git a/test/bdd/fixtures/docker-compose.yml b/test/bdd/fixtures/docker-compose.yml index 558a7fbaa..7277c7a39 100644 --- a/test/bdd/fixtures/docker-compose.yml +++ b/test/bdd/fixtures/docker-compose.yml @@ -1026,7 +1026,6 @@ services: - VCT_API_READ_TOKEN=vctread - VCT_API_WRITE_TOKEN=vctwrite - VCT_TLS_CACERTS=/etc/orb/tls/ec-cacert.pem - - VCT_CONTEXT_PROVIDER_URL=https://orb.file-server.com:12096/ld-contexts.json volumes: - ./keys/tls:/etc/orb/tls ports: @@ -1158,25 +1157,6 @@ services: orb_net: ipv4_address: 172.20.0.21 - orb.file-server.com: # file server for hosting static resources (e.g. JSON-LD contexts) - container_name: orb.file-server.com - image: halverneus/static-file-server:latest - environment: - - PORT=12096 - - FOLDER=/data - - TLS_CERT=/etc/tls/ec-pubCert.pem - - TLS_KEY=/etc/tls/ec-key.pem - - CORS=true - ports: - - 12096:12096 - volumes: - - ./contexts:/data - - ./keys/tls:/etc/tls - networks: - orb_net: - ipv4_address: 172.20.0.22 - - aws-kms: container_name: aws-kms image: nsmithuk/local-kms:latest